* [PATCH] mmc: toshsd: Fix unbalanced locking
@ 2014-12-11 3:10 Axel Lin
2014-12-19 10:58 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2014-12-11 3:10 UTC (permalink / raw)
To: Chris Ball, Ulf Hansson; +Cc: Ondrej Zary, linux-mmc@vger.kernel.org
Fix returning IRQ_HANDLED with spin_lock held.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/mmc/host/toshsd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/toshsd.c b/drivers/mmc/host/toshsd.c
index 4666262..a5aa539 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;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mmc: toshsd: Fix unbalanced locking
2014-12-11 3:10 [PATCH] mmc: toshsd: Fix unbalanced locking Axel Lin
@ 2014-12-19 10:58 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2014-12-19 10:58 UTC (permalink / raw)
To: Axel Lin; +Cc: Chris Ball, Ondrej Zary, linux-mmc@vger.kernel.org
On 11 December 2014 at 04:10, Axel Lin <axel.lin@ingics.com> wrote:
> Fix returning IRQ_HANDLED with spin_lock held.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Thanks! Queued for 3.20.
Kind regards
Uffe
> ---
> drivers/mmc/host/toshsd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/toshsd.c b/drivers/mmc/host/toshsd.c
> index 4666262..a5aa539 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;
> --
> 1.9.1
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-12-19 10:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-11 3:10 [PATCH] mmc: toshsd: Fix unbalanced locking Axel Lin
2014-12-19 10:58 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox