staging: comedi: ni_labpc: unlock spinlock on command error
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 5 Jun 2012 18:12:18 +0000 (11:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Jun 2012 23:54:29 +0000 (16:54 -0700)
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>
drivers/staging/comedi/drivers/ni_labpc.c

index 53349777246bb0e0d740cffb04dae13e8cc86398..1d739b26e678f21a280348dd97664b56edcf8fb2 100644 (file)
@@ -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);