Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 89692
b: refs/heads/master
c: b70a41e
h: refs/heads/master
v: v3
  • Loading branch information
bo yang authored and James Bottomley committed Apr 7, 2008
1 parent 6163f0c commit 7849f84
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ccde6b8d6217834def292030a1864d517f55ded5
refs/heads/master: b70a41e077b3405d4b41d34db31b39c05bf142b5
11 changes: 5 additions & 6 deletions trunk/drivers/scsi/megaraid/megaraid_sas.c
Original file line number Diff line number Diff line change
Expand Up @@ -2909,7 +2909,6 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
void *sense = NULL;
dma_addr_t sense_handle;
u32 *sense_ptr;
unsigned long *sense_buff;

memset(kbuff_arr, 0, sizeof(kbuff_arr));

Expand Down Expand Up @@ -3014,14 +3013,14 @@ megasas_mgmt_fw_ioctl(struct megasas_instance *instance,
*/
if (ioc->sense_len) {
/*
* sense_buff points to the location that has the user
* sense_ptr points to the location that has the user
* sense buffer address
*/
sense_buff = (unsigned long *) ((unsigned long)ioc->frame.raw +
ioc->sense_off);
sense_ptr = (u32 *) ((unsigned long)ioc->frame.raw +
ioc->sense_off);

if (copy_to_user((void __user *)(unsigned long)(*sense_buff),
sense, ioc->sense_len)) {
if (copy_to_user((void __user *)((unsigned long)(*sense_ptr)),
sense, ioc->sense_len)) {
printk(KERN_ERR "megasas: Failed to copy out to user "
"sense data\n");
error = -EFAULT;
Expand Down

0 comments on commit 7849f84

Please sign in to comment.