diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 11:41:41 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 11:41:41 -0500 |
| commit | 38a9a621aba953ddb8051547e98c10ec3c741312 (patch) | |
| tree | 53fc96a2902d2c5bf2a82d97d99b78570c76291e /drivers/scsi/aacraid/commctrl.c | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
| parent | e75d51761debffbc5e556e02c8ceda4f8c1a3e83 (diff) | |
| download | talos-op-linux-38a9a621aba953ddb8051547e98c10ec3c741312.tar.gz talos-op-linux-38a9a621aba953ddb8051547e98c10ec3c741312.zip | |
Merge HEAD from ../scsi-misc-2.6-old
Diffstat (limited to 'drivers/scsi/aacraid/commctrl.c')
| -rw-r--r-- | drivers/scsi/aacraid/commctrl.c | 6 |
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) char *driver_version = aac_driver_version; u32 version; - response.compat = cpu_to_le32(1); + response.compat = 1; version = (simple_strtol(driver_version, &driver_version, 10) << 24) | 0x00000400; 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) rcode = -ENOMEM; goto cleanup; } - sg_user[i] = (void __user *)usg->sg[i].addr; + sg_user[i] = (void __user *)(long)usg->sg[i].addr; sg_list[i] = p; // save so we can clean up later sg_indx = i; @@ -624,7 +624,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) rcode = -ENOMEM; goto cleanup; } - sg_user[i] = (void __user *)upsg->sg[i].addr; + sg_user[i] = (void __user *)(long)upsg->sg[i].addr; sg_list[i] = p; // save so we can clean up later sg_indx = i; |
