summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:48:50 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:48:50 +0100
commit7e718b4bd2ea78702b0f00c668ba99ccfa987181 (patch)
tree33f2f7f3b9816380150c89b057f97268abf4f5f2 /drivers/spi
parent1f54f94284c316a338f75ed8804ff7e9aa92eee3 (diff)
parente93b07244d6e1d6105df78b6117b00c940006b45 (diff)
downloadlinux-7e718b4bd2ea78702b0f00c668ba99ccfa987181.tar.bz2
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 2a20c32c8277..8bc7de019e5d 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -774,7 +774,7 @@ static int spi_queued_transfer(struct spi_device *spi, struct spi_message *msg)
msg->status = -EINPROGRESS;
list_add_tail(&msg->queue, &master->queue);
- if (master->running && !master->busy)
+ if (!master->busy)
queue_kthread_work(&master->kworker, &master->pump_messages);
spin_unlock_irqrestore(&master->queue_lock, flags);
@@ -1169,7 +1169,7 @@ int spi_register_master(struct spi_master *master)
else {
status = spi_master_initialize_queue(master);
if (status) {
- device_unregister(&master->dev);
+ device_del(&master->dev);
goto done;
}
}