evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: comedi: das1800.c: fix a locking error on the error path.

Browse source 
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-05-04 16:06:33 -07:00
parent b74a967085
commit d18c5906d0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/comedi/drivers/das1800.c
View file

@ -1637,7 +1637,8 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
} }
if (i == timeout) { if (i == timeout) {
comedi_error(dev, "timeout"); comedi_error(dev, "timeout");
return -ETIME; n = -ETIME;
goto exit;
} }
dpnt = inw(dev->iobase + DAS1800_FIFO); dpnt = inw(dev->iobase + DAS1800_FIFO);
/* shift data to offset binary for bipolar ranges */ /* shift data to offset binary for bipolar ranges */
@ -1645,6 +1646,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
dpnt += 1 << (thisboard->resolution - 1); dpnt += 1 << (thisboard->resolution - 1);
data[n] = dpnt; data[n] = dpnt;
} }
exit:
spin_unlock_irqrestore(&dev->spinlock, irq_flags); spin_unlock_irqrestore(&dev->spinlock, irq_flags);
return n; return n;