patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / s390 / block / dasd_cmb.c

diff --git a/drivers/s390/block/dasd_cmb.c b/drivers/s390/block/dasd_cmb.c
index 8139ffd..ed1ab47 100644 (file)
--- a/drivers/s390/block/dasd_cmb.c
+++ b/drivers/s390/block/dasd_cmb.c
@@ -58,7 +58,7 @@ static int
 dasd_ioctl_readall_cmb(struct block_device *bdev, int no, long args)
 {
        struct dasd_device *device;
-       struct cmbdata * __user udata;
+       struct cmbdata __user *udata;
        struct cmbdata data;
        size_t size;
        int ret;
@@ -66,7 +66,7 @@ dasd_ioctl_readall_cmb(struct block_device *bdev, int no, long args)
        device = bdev->bd_disk->private_data;
        if (!device)
                return -EINVAL;
-       udata = (void *) args;
+       udata = (void __user *) args;
        size = _IOC_SIZE(no);
 
        if (!access_ok(VERIFY_WRITE, udata, size))