aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/message/fusion/mptctl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 70178a8940b2..6029509702d3 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1774,7 +1774,10 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
1774 ulong timeout; 1774 ulong timeout;
1775 struct scsi_device *sdev; 1775 struct scsi_device *sdev;
1776 1776
1777 /* bufIn and bufOut are used for user to kernel space transfers
1778 */
1777 bufIn.kptr = bufOut.kptr = NULL; 1779 bufIn.kptr = bufOut.kptr = NULL;
1780 bufIn.len = bufOut.len = 0;
1778 1781
1779 if (((iocnum = mpt_verify_adapter(karg.hdr.iocnum, &ioc)) < 0) || 1782 if (((iocnum = mpt_verify_adapter(karg.hdr.iocnum, &ioc)) < 0) ||
1780 (ioc == NULL)) { 1783 (ioc == NULL)) {
@@ -2108,11 +2111,6 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)
2108 psge = (char *) (((int *) mf) + karg.dataSgeOffset); 2111 psge = (char *) (((int *) mf) + karg.dataSgeOffset);
2109 flagsLength = 0; 2112 flagsLength = 0;
2110 2113
2111 /* bufIn and bufOut are used for user to kernel space transfers
2112 */
2113 bufIn.kptr = bufOut.kptr = NULL;
2114 bufIn.len = bufOut.len = 0;
2115
2116 if (karg.dataOutSize > 0) 2114 if (karg.dataOutSize > 0)
2117 sgSize ++; 2115 sgSize ++;
2118 2116