[patch] spi: release lock on error path in spi_pump_messages()

[patch] spi: release lock on error path in spi_pump_messages()

[Dan Carpenter]

We should release the lock here and enable IRQs before returning.

Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5ae1e84..ab1bdce 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -535,6 +535,7 @@ static void spi_pump_messages(struct kthread_work *work)
 			if (ret) {
 				dev_err(&master->dev,
 					"failed to unprepare transfer hardware\n");
+				spin_unlock_irqrestore(&master->queue_lock, flags);
 				return;
 			}
 		}

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/

Re: [patch] spi: release lock on error path in spi_pump_messages()

[walter harms]

Am 10.03.2012 09:57, schrieb Dan Carpenter:
> We should release the lock here and enable IRQs before returning.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> 
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 5ae1e84..ab1bdce 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -535,6 +535,7 @@ static void spi_pump_messages(struct kthread_work *work)
>  			if (ret) {
>  				dev_err(&master->dev,
>  					"failed to unprepare transfer hardware\n");
> +				spin_unlock_irqrestore(&master->queue_lock, flags);
>  				return;
>  			}
>  		}


hi Dan,
do you want to protect dev_err() by a spn_lock ?

re,
 wh

> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/

Re: [patch] spi: release lock on error path in spi_pump_messages()

[Grant Likely]

On Sat, 10 Mar 2012 10:38:27 +0100, walter harms <wharms-fPG8STNUNVg@public.gmane.org> wrote:
> 
> 
> Am 10.03.2012 09:57, schrieb Dan Carpenter:
> > We should release the lock here and enable IRQs before returning.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > 
> > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> > index 5ae1e84..ab1bdce 100644
> > --- a/drivers/spi/spi.c
> > +++ b/drivers/spi/spi.c
> > @@ -535,6 +535,7 @@ static void spi_pump_messages(struct kthread_work *work)
> >  			if (ret) {
> >  				dev_err(&master->dev,
> >  					"failed to unprepare transfer hardware\n");
> > +				spin_unlock_irqrestore(&master->queue_lock, flags);
> >  				return;
> >  			}
> >  		}
> 
> 
> hi Dan,
> do you want to protect dev_err() by a spn_lock ?

Applied, after moving unlock above the dev_err.

g.


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/

Re: [patch] spi: release lock on error path in spi_pump_messages()

[Dan Carpenter]

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

On Sat, Mar 10, 2012 at 07:43:07PM -0700, Grant Likely wrote:
> On Sat, 10 Mar 2012 10:38:27 +0100, walter harms <wharms@bfs.de> wrote:
> > hi Dan,
> > do you want to protect dev_err() by a spn_lock ?
> 
> Applied, after moving unlock above the dev_err.
> 

Thanks.

I was going to resend this with Walter's change btw.  I wasn't going
to ignore his review comments.

Anyway, thanks again Grant and Walter.

regards,
dan carpenter


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [patch] spi: release lock on error path in spi_pump_messages()

[Grant Likely]

On Sun, 11 Mar 2012 09:20:59 +0300, Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> On Sat, Mar 10, 2012 at 07:43:07PM -0700, Grant Likely wrote:
> > On Sat, 10 Mar 2012 10:38:27 +0100, walter harms <wharms-fPG8STNUNVg@public.gmane.org> wrote:
> > > hi Dan,
> > > do you want to protect dev_err() by a spn_lock ?
> > 
> > Applied, after moving unlock above the dev_err.
> > 
> 
> Thanks.
> 
> I was going to resend this with Walter's change btw.  I wasn't going
> to ignore his review comments.

I assumed you would.  It was just simpler for me to pick it up with the
trivial change.

g.


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/