diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-06-05 11:12:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-11 16:54:29 -0700 |
| commit | 513e48f90a9d092ffcf8301b6ed10a8d8a5ebe77 (patch) | |
| tree | dfbd43b0061da340f45385c0766197a68b18901a | |
| parent | 72fd9facfb697d5f7b61958bb10efaabbd8461eb (diff) | |
| download | kernel_goldelico_gta04-513e48f90a9d092ffcf8301b6ed10a8d8a5ebe77.zip kernel_goldelico_gta04-513e48f90a9d092ffcf8301b6ed10a8d8a5ebe77.tar.gz kernel_goldelico_gta04-513e48f90a9d092ffcf8301b6ed10a8d8a5ebe77.tar.bz2 | |
staging: comedi: ni_labpc: unlock spinlock on command error
When starting the acquisition the labpc_ai_cmd function was
exiting without unlocking the spinlock. This results in a
sparse warning:
warning: context imbalance in 'labpc_ai_cmd' - different lock contexts for basic block
Add the missing spin_unlock_irqrestore calls.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 5334977..1d739b2 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c @@ -1386,6 +1386,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) break; default: comedi_error(dev, "bug with start_src"); + spin_unlock_irqrestore(&dev->spinlock, flags); return -1; break; } @@ -1398,6 +1399,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) break; default: comedi_error(dev, "bug with stop_src"); + spin_unlock_irqrestore(&dev->spinlock, flags); return -1; } devpriv->write_byte(devpriv->command2_bits, dev->iobase + COMMAND2_REG); |