Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / dream / pmem.c

diff --git a/drivers/staging/dream/pmem.c b/drivers/staging/dream/pmem.c
index 3640d1f2376d62cf4c7d57802675a7a27c8f40fd..4d3d300bb7361c23591d4911e5170cc0170bb6c1 100644 (file)
--- a/drivers/staging/dream/pmem.c
+++ b/drivers/staging/dream/pmem.c
@@ -1233,7 +1233,7 @@ int pmem_setup(struct android_pmem_platform_data *pdata,
        pmem[id].ioctl = ioctl;
        pmem[id].release = release;
        init_rwsem(&pmem[id].bitmap_sem);
-       init_MUTEX(&pmem[id].data_list_sem);
+       sema_init(&pmem[id].data_list_sem, 1);
        INIT_LIST_HEAD(&pmem[id].data_list);
        pmem[id].dev.name = pdata->name;
        pmem[id].dev.minor = id;