diff --git a/[refs] b/[refs]
index 53bb9ab59471..cd6294efdfaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 054ebcc4a88509e2488f341e8f0400045258f2a1
+refs/heads/master: 9af4acc096eeb1ddd6f507d291c7c901949224a6
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 7ea06af8636a..eb3587a30df2 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/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;