aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/commctrl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/aacraid/commctrl.c')
-rw-r--r--drivers/scsi/aacraid/commctrl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
index 71f1cad9b5f0..ef623bd965f5 100644
--- a/drivers/scsi/aacraid/commctrl.c
+++ b/drivers/scsi/aacraid/commctrl.c
@@ -408,7 +408,7 @@ static int check_revision(struct aac_dev *dev, void __user *arg)
408 char *driver_version = aac_driver_version; 408 char *driver_version = aac_driver_version;
409 u32 version; 409 u32 version;
410 410
411 response.compat = cpu_to_le32(1); 411 response.compat = 1;
412 version = (simple_strtol(driver_version, 412 version = (simple_strtol(driver_version,
413 &driver_version, 10) << 24) | 0x00000400; 413 &driver_version, 10) << 24) | 0x00000400;
414 version += simple_strtol(driver_version + 1, &driver_version, 10) << 16; 414 version += simple_strtol(driver_version + 1, &driver_version, 10) << 16;
@@ -574,7 +574,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
574 rcode = -ENOMEM; 574 rcode = -ENOMEM;
575 goto cleanup; 575 goto cleanup;
576 } 576 }
577 sg_user[i] = (void __user *)usg->sg[i].addr; 577 sg_user[i] = (void __user *)(long)usg->sg[i].addr;
578 sg_list[i] = p; // save so we can clean up later 578 sg_list[i] = p; // save so we can clean up later
579 sg_indx = i; 579 sg_indx = i;
580 580
@@ -624,7 +624,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
624 rcode = -ENOMEM; 624 rcode = -ENOMEM;
625 goto cleanup; 625 goto cleanup;
626 } 626 }
627 sg_user[i] = (void __user *)upsg->sg[i].addr; 627 sg_user[i] = (void __user *)(long)upsg->sg[i].addr;
628 sg_list[i] = p; // save so we can clean up later 628 sg_list[i] = p; // save so we can clean up later
629 sg_indx = i; 629 sg_indx = i;
630 630