2015-04-07 14:43:23

by Niklas Cassel

Subject: [PATCH] dmaengine: at_xdmac: unlock spin lock before return

Signed-off-by: Niklas Cassel <[email protected]>
---
drivers/dma/at_xdmac.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
index d9891d3..933e4b3 100644
--- a/drivers/dma/at_xdmac.c
+++ b/drivers/dma/at_xdmac.c
@@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
dev_dbg(chan2dev(chan), "%s\n", __func__);

spin_lock_bh(&atchan->lock);
- if (!at_xdmac_chan_is_paused(atchan))
+ if (!at_xdmac_chan_is_paused(atchan)) {
+ spin_unlock_bh(&atchan->lock);
return 0;
+ }

at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
--
2.1.4

2015-04-10 13:51:46

by Ludovic Desroches

Subject: Re: [PATCH] dmaengine: at_xdmac: unlock spin lock before return

On Tue, Apr 07, 2015 at 04:42:45PM +0200, Niklas Cassel wrote:
> Signed-off-by: Niklas Cassel <[email protected]>

of course

Acked-by: Ludovic Desroches <[email protected]>

Thanks

> ---
> drivers/dma/at_xdmac.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
> index d9891d3..933e4b3 100644
> --- a/drivers/dma/at_xdmac.c
> +++ b/drivers/dma/at_xdmac.c
> @@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
> dev_dbg(chan2dev(chan), "%s\n", __func__);
>
> spin_lock_bh(&atchan->lock);
> - if (!at_xdmac_chan_is_paused(atchan))
> + if (!at_xdmac_chan_is_paused(atchan)) {
> + spin_unlock_bh(&atchan->lock);
> return 0;
> + }
>
> at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
> clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
> --
> 2.1.4
>

2015-04-17 18:15:11

by Vinod Koul

Subject: Re: [PATCH] dmaengine: at_xdmac: unlock spin lock before return

On Tue, Apr 07, 2015 at 04:42:45PM +0200, Niklas Cassel wrote:
> Signed-off-by: Niklas Cassel <[email protected]>
> ---
> drivers/dma/at_xdmac.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
> index d9891d3..933e4b3 100644
> --- a/drivers/dma/at_xdmac.c
> +++ b/drivers/dma/at_xdmac.c
> @@ -1154,8 +1154,10 @@ static int at_xdmac_device_resume(struct dma_chan *chan)
> dev_dbg(chan2dev(chan), "%s\n", __func__);
>
> spin_lock_bh(&atchan->lock);
> - if (!at_xdmac_chan_is_paused(atchan))
> + if (!at_xdmac_chan_is_paused(atchan)) {
> + spin_unlock_bh(&atchan->lock);
> return 0;
> + }
>
> at_xdmac_write(atxdmac, AT_XDMAC_GRWR, atchan->mask);
> clear_bit(AT_XDMAC_CHAN_IS_PAUSED, &atchan->status);
> --
> 2.1.4
>

Applied now
--
~Vinod