summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-01 14:55:16 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-01 14:55:16 +0100
commite47ef0f1affff3e017d0477b283a26beeb45258a (patch)
treeae00210c3b875e235c3cea284c8bf44a841a5199 /drivers/spi/spi.c
parent823cd0454325509d84dbf8e301c182c8a2711c65 (diff)
parent1ad849aee5f53353ed88d9cd3d68a51b03a7d44f (diff)
downloadop-kernel-dev-e47ef0f1affff3e017d0477b283a26beeb45258a.zip
op-kernel-dev-e47ef0f1affff3e017d0477b283a26beeb45258a.tar.gz
Merge branch 'spi-fix' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 0cabf15..45cb6a9 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -543,17 +543,16 @@ static void spi_pump_messages(struct kthread_work *work)
/* Lock queue and check for queue work */
spin_lock_irqsave(&master->queue_lock, flags);
if (list_empty(&master->queue) || !master->running) {
- if (master->busy && master->unprepare_transfer_hardware) {
- 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;
- }
+ if (!master->busy) {
+ spin_unlock_irqrestore(&master->queue_lock, flags);
+ return;
}
master->busy = false;
spin_unlock_irqrestore(&master->queue_lock, flags);
+ if (master->unprepare_transfer_hardware &&
+ master->unprepare_transfer_hardware(master))
+ dev_err(&master->dev,
+ "failed to unprepare transfer hardware\n");
return;
}
OpenPOWER on IntegriCloud