From: Axel Lin <axel.lin@ingics.com>
Date: Thu, 11 Dec 2014 03:10:44 +0000 (+0800)
Subject: mmc: toshsd: Fix unbalanced locking
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a66fdae771487762519db0546e9ccb648a2f911;p=linux-beck.git

mmc: toshsd: Fix unbalanced locking

Fix returning IRQ_HANDLED with spin_lock held.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---

diff --git a/drivers/mmc/host/toshsd.c b/drivers/mmc/host/toshsd.c
index e5d8dec65f44..e2cdd5fb1423 100644
--- a/drivers/mmc/host/toshsd.c
+++ b/drivers/mmc/host/toshsd.c
@@ -176,7 +176,8 @@ static irqreturn_t toshsd_thread_irq(int irq, void *dev_id)
 	spin_lock_irqsave(&host->lock, flags);
 
 	if (!sg_miter_next(sg_miter))
-		return IRQ_HANDLED;
+		goto done;
+
 	buf = sg_miter->addr;
 
 	/* Ensure we dont read more than one block. The chip will interrupt us
@@ -198,6 +199,7 @@ static irqreturn_t toshsd_thread_irq(int irq, void *dev_id)
 	sg_miter->consumed = count;
 	sg_miter_stop(sg_miter);
 
+done:
 	spin_unlock_irqrestore(&host->lock, flags);
 
 	return IRQ_HANDLED;