From 4918c5c1bcb13c305166704717b7748c46554144 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 7 Sep 2012 10:17:46 +1000 Subject: [PATCH] drivers/scsi/ipr.c: 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 Acked-by: Brian King Cc: James Bottomley Cc: Signed-off-by: Andrew Morton --- drivers/scsi/ipr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index ac861afa1277..ae1296749365 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); -- 2.39.5