aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r--drivers/scsi/megaraid.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 3cce75d70263..40ee07dab450 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -3571,7 +3571,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
3571 /* 3571 /*
3572 * The user passthru structure 3572 * The user passthru structure
3573 */ 3573 */
3574 upthru = (mega_passthru __user *)MBOX(uioc)->xferaddr; 3574 upthru = (mega_passthru __user *)(unsigned long)MBOX(uioc)->xferaddr;
3575 3575
3576 /* 3576 /*
3577 * Copy in the user passthru here. 3577 * Copy in the user passthru here.
@@ -3623,7 +3623,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
3623 /* 3623 /*
3624 * Get the user data 3624 * Get the user data
3625 */ 3625 */
3626 if( copy_from_user(data, (char __user *)uxferaddr, 3626 if( copy_from_user(data, (char __user *)(unsigned long) uxferaddr,
3627 pthru->dataxferlen) ) { 3627 pthru->dataxferlen) ) {
3628 rval = (-EFAULT); 3628 rval = (-EFAULT);
3629 goto freemem_and_return; 3629 goto freemem_and_return;
@@ -3649,7 +3649,7 @@ megadev_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
3649 * Is data going up-stream 3649 * Is data going up-stream
3650 */ 3650 */
3651 if( pthru->dataxferlen && (uioc.flags & UIOC_RD) ) { 3651 if( pthru->dataxferlen && (uioc.flags & UIOC_RD) ) {
3652 if( copy_to_user((char __user *)uxferaddr, data, 3652 if( copy_to_user((char __user *)(unsigned long) uxferaddr, data,
3653 pthru->dataxferlen) ) { 3653 pthru->dataxferlen) ) {
3654 rval = (-EFAULT); 3654 rval = (-EFAULT);
3655 } 3655 }
@@ -3702,7 +3702,7 @@ freemem_and_return:
3702 /* 3702 /*
3703 * Get the user data 3703 * Get the user data
3704 */ 3704 */
3705 if( copy_from_user(data, (char __user *)uxferaddr, 3705 if( copy_from_user(data, (char __user *)(unsigned long) uxferaddr,
3706 uioc.xferlen) ) { 3706 uioc.xferlen) ) {
3707 3707
3708 pci_free_consistent(pdev, 3708 pci_free_consistent(pdev,
@@ -3742,7 +3742,7 @@ freemem_and_return:
3742 * Is data going up-stream 3742 * Is data going up-stream
3743 */ 3743 */
3744 if( uioc.xferlen && (uioc.flags & UIOC_RD) ) { 3744 if( uioc.xferlen && (uioc.flags & UIOC_RD) ) {
3745 if( copy_to_user((char __user *)uxferaddr, data, 3745 if( copy_to_user((char __user *)(unsigned long) uxferaddr, data,
3746 uioc.xferlen) ) { 3746 uioc.xferlen) ) {
3747 3747
3748 rval = (-EFAULT); 3748 rval = (-EFAULT);