From 1e0e1857524da18ab7a148f3364f8641ff2ee546 Mon Sep 17 00:00:00 2001 From: Shubhrajyoti D Date: Thu, 10 May 2012 19:20:41 +0530 Subject: [PATCH] --- yaml --- r: 307645 b: refs/heads/master c: 7dfd2bd70228d1f8d468d58cb3d12ecd618479ed h: refs/heads/master i: 307643: b889e7209d1125389cfc209d79a09b545f16f0e5 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f32334909efd..81b98607bd63 100644 --- 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 index 37c555ec59ab..2d65b1684cdc 100644 --- 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,