Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / das1800.c

diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c
index 3c3e0455c7c412077f2066b71881edada32fd5f0..de5e82fec8781dd5d43416d6a58fdf63839fe2d2 100644 (file)
--- a/drivers/staging/comedi/drivers/das1800.c
+++ b/drivers/staging/comedi/drivers/das1800.c
@@ -797,10 +797,8 @@ static int das1800_detach(struct comedi_device *dev)
                        free_dma(devpriv->dma0);
                if (devpriv->dma1)
                        free_dma(devpriv->dma1);
-               if (devpriv->ai_buf0)
-                       kfree(devpriv->ai_buf0);
-               if (devpriv->ai_buf1)
-                       kfree(devpriv->ai_buf1);
+               kfree(devpriv->ai_buf0);
+               kfree(devpriv->ai_buf1);
        }
 
        printk("comedi%d: %s: remove\n", dev->minor,
@@ -1639,7 +1637,8 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
                }
                if (i == timeout) {
                        comedi_error(dev, "timeout");
-                       return -ETIME;
+                       n = -ETIME;
+                       goto exit;
                }
                dpnt = inw(dev->iobase + DAS1800_FIFO);
                /* shift data to offset binary for bipolar ranges */
@@ -1647,6 +1646,7 @@ static int das1800_ai_rinsn(struct comedi_device *dev,
                        dpnt += 1 << (thisboard->resolution - 1);
                data[n] = dpnt;
        }
+exit:
        spin_unlock_irqrestore(&dev->spinlock, irq_flags);
 
        return n;