diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 15:02:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 15:02:41 -0400 |
| commit | 054552272e6e152ff40f8b7f164dd390a5a62097 (patch) | |
| tree | 9be4ee91a0ea090672f6ea1be2f6e6eef027d810 /drivers/message | |
| parent | 5b461209d07ab9a9284760f6ffe696de558031a3 (diff) | |
| parent | 1ff2f40305772b159a91c19590ee159d3a504afc (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull final round of SCSI updates from James Bottomley:
"This is primarily another round of driver updates (bnx2fc, qla2xxx,
qla4xxx) including the target mode driver for qla2xxx. We've also got
a couple of regression fixes (async scanning, broken this merge window
and a fix to a long standing break in the scsi_wait_scan module)."
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (45 commits)
[SCSI] fix scsi_wait_scan
[SCSI] fix async probe regression
[SCSI] be2iscsi: fix dma free size mismatch regression
[SCSI] qla4xxx: Update driver version to 5.02.00-k17
[SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure
[SCSI] qla4xxx: Add change_queue_depth API support
[SCSI] qla4xxx: Fix clear ddb mbx command failure issue.
[SCSI] qla4xxx: Fix kernel panic during discovery logout.
[SCSI] qla4xxx: Correct early completion of pending mbox.
[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
[SCSI] libfcoe: Add fcoe_sysfs
[SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a member
[SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member
[SCSI] Fix dm-multipath starvation when scsi host is busy
[SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.
[SCSI] qla2xxx: don't free pool that wasn't allocated
[SCSI] mptfusion: unlock on error in mpt_config()
[SCSI] tcm_qla2xxx: Add >= 24xx series fabric module for target-core
[SCSI] qla2xxx: Add LLD target-mode infrastructure for >= 24xx series
[SCSI] Revert "qla2xxx: During loopdown perform Diagnostic loopback."
...
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/fusion/mptbase.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index a5c591ffe395..444143e5f28c 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
| @@ -6483,6 +6483,7 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) | |||
| 6483 | printk(MYIOC_s_INFO_FMT "%s: host reset in" | 6483 | printk(MYIOC_s_INFO_FMT "%s: host reset in" |
| 6484 | " progress mpt_config timed out.!!\n", | 6484 | " progress mpt_config timed out.!!\n", |
| 6485 | __func__, ioc->name); | 6485 | __func__, ioc->name); |
| 6486 | mutex_unlock(&ioc->mptbase_cmds.mutex); | ||
| 6486 | return -EFAULT; | 6487 | return -EFAULT; |
| 6487 | } | 6488 | } |
| 6488 | spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags); | 6489 | spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags); |