diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 11:40:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-16 11:40:40 -0500 |
| commit | a11d9b623ea7cdcd647318bb2b3282d4c337f086 (patch) | |
| tree | 856c45c8914dddbce77d8b85c93e067de99502de /drivers/message/fusion/mptscsih.c | |
| parent | 4c44323db15f26f4c744f06179daa43711cdb708 (diff) | |
| parent | 32aeef605aa01e1fee45e052eceffb00e72ba2b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] Skip deleted devices in __scsi_device_lookup_by_target()
[SCSI] Add SUN Universal Xport to no attach blacklist
[SCSI] iscsi_tcp: make padbuf non-static
[SCSI] mpt fusion: Add Firmware debug support
[SCSI] mpt fusion: Add separate msi enable disable for FC,SPI,SAS
[SCSI] mpt fusion: Update MPI Headers to version 01.05.19
[SCSI] qla2xxx: Fix ISP restart bug in multiq code
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index ee090413e598..e62c6bc4ad33 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -1846,6 +1846,9 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) | |||
| 1846 | if (hd->timeouts < -1) | 1846 | if (hd->timeouts < -1) |
| 1847 | hd->timeouts++; | 1847 | hd->timeouts++; |
| 1848 | 1848 | ||
| 1849 | if (mpt_fwfault_debug) | ||
| 1850 | mpt_halt_firmware(ioc); | ||
| 1851 | |||
| 1849 | /* Most important! Set TaskMsgContext to SCpnt's MsgContext! | 1852 | /* Most important! Set TaskMsgContext to SCpnt's MsgContext! |
| 1850 | * (the IO to be ABORT'd) | 1853 | * (the IO to be ABORT'd) |
| 1851 | * | 1854 | * |