diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-07-30 11:16:35 +0300 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-14 12:02:17 +0100 |
| commit | d995e1b7c0e92af038d9ac322e35b3caaf905b10 (patch) | |
| tree | 3e91453864d45e184ce40c37e8514be6ad388c04 /drivers/scsi/ipr.c | |
| parent | f1ba8a4fe59b21a6988ad5999e74e9907b142ee3 (diff) | |
| download | lwn-d995e1b7c0e92af038d9ac322e35b3caaf905b10.tar.gz lwn-d995e1b7c0e92af038d9ac322e35b3caaf905b10.zip | |
[SCSI] ipr: missing unlock before a return
We recently changed the locking in this function, but this return was
missed. It needs an unlock and the IRQs need to be restored.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 07b14ba6906a..7a5ccb2c1565 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -5874,8 +5874,11 @@ static int ipr_queuecommand(struct Scsi_Host *shost, goto err_nodev; } - if (ipr_is_gata(res) && res->sata_port) - return ata_sas_queuecmd(scsi_cmd, res->sata_port->ap); + if (ipr_is_gata(res) && res->sata_port) { + rc = ata_sas_queuecmd(scsi_cmd, res->sata_port->ap); + spin_unlock_irqrestore(shost->host_lock, lock_flags); + return rc; + } ipr_cmd = __ipr_get_free_ipr_cmnd(ioa_cfg); spin_unlock_irqrestore(shost->host_lock, lock_flags); |