From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 10 Mar 2012 08:57:29 +0000 (+0300)
Subject: spi: release lock on error path in spi_pump_messages()
X-Git-Tag: v3.4-rc1~170^2~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9af4acc096eeb1ddd6f507d291c7c901949224a6;p=linux-block.git

spi: release lock on error path in spi_pump_messages()

We should release the lock here and enable IRQs before returning.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
[grant.likely: move unlock above dev_err() call]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 7ea06af8636a..eb3587a30df2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -533,6 +533,7 @@ static void spi_pump_messages(struct kthread_work *work)
 		if (master->busy) {
 			ret = master->unprepare_transfer_hardware(master);
 			if (ret) {
+				spin_unlock_irqrestore(&master->queue_lock, flags);
 				dev_err(&master->dev,
 					"failed to unprepare transfer hardware\n");
 				return;