---

yaml --- r: 307645 b: refs/heads/master c: 7dfd2bd h: refs/heads/master i: 307643: b889e72 v: v3
git-mirror · May 11, 2012 · 1e0e185 · 1e0e185
1 parent 67ad073
commit 1e0e185
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d6467ee58b4cddd34b01d642d282a353dd57ce9
+refs/heads/master: 7dfd2bd70228d1f8d468d58cb3d12ecd618479ed
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
@@ -532,7 +532,7 @@ 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) {
+		if (master->busy && master->unprepare_transfer_hardware) {
 			ret = master->unprepare_transfer_hardware(master);
 			if (ret) {
 				spin_unlock_irqrestore(&master->queue_lock, flags);
@@ -562,7 +562,7 @@ static void spi_pump_messages(struct kthread_work *work)
 		master->busy = true;
 	spin_unlock_irqrestore(&master->queue_lock, flags);
 
-	if (!was_busy) {
+	if (!was_busy && master->prepare_transfer_hardware) {
 		ret = master->prepare_transfer_hardware(master);
 		if (ret) {
 			dev_err(&master->dev,