diff options
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
-rw-r--r-- | drivers/message/fusion/mptctl.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 9b2e2198aee9..caa8f568a41c 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
@@ -360,8 +360,8 @@ static int mptctl_bus_reset(MPT_ADAPTER *ioc, u8 function) | |||
360 | u16 iocstatus; | 360 | u16 iocstatus; |
361 | 361 | ||
362 | /* bus reset is only good for SCSI IO, RAID PASSTHRU */ | 362 | /* bus reset is only good for SCSI IO, RAID PASSTHRU */ |
363 | if (!(function == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH) || | 363 | if (!(function == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH || |
364 | (function == MPI_FUNCTION_SCSI_IO_REQUEST)) { | 364 | function == MPI_FUNCTION_SCSI_IO_REQUEST)) { |
365 | dtmprintk(ioc, printk(MYIOC_s_WARN_FMT | 365 | dtmprintk(ioc, printk(MYIOC_s_WARN_FMT |
366 | "TaskMgmt, not SCSI_IO!!\n", ioc->name)); | 366 | "TaskMgmt, not SCSI_IO!!\n", ioc->name)); |
367 | return -EPERM; | 367 | return -EPERM; |
@@ -621,11 +621,8 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
621 | */ | 621 | */ |
622 | iocnumX = khdr.iocnum & 0xFF; | 622 | iocnumX = khdr.iocnum & 0xFF; |
623 | if (((iocnum = mpt_verify_adapter(iocnumX, &iocp)) < 0) || | 623 | if (((iocnum = mpt_verify_adapter(iocnumX, &iocp)) < 0) || |
624 | (iocp == NULL)) { | 624 | (iocp == NULL)) |
625 | printk(KERN_DEBUG MYNAM "%s::mptctl_ioctl() @%d - ioc%d not found!\n", | ||
626 | __FILE__, __LINE__, iocnumX); | ||
627 | return -ENODEV; | 625 | return -ENODEV; |
628 | } | ||
629 | 626 | ||
630 | if (!iocp->active) { | 627 | if (!iocp->active) { |
631 | printk(KERN_DEBUG MYNAM "%s::mptctl_ioctl() @%d - Controller disabled.\n", | 628 | printk(KERN_DEBUG MYNAM "%s::mptctl_ioctl() @%d - Controller disabled.\n", |