From 227776419e15ed78d8ac8d2b9507154d46c68ff0 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 4 May 2010 16:06:33 -0700
Subject: [PATCH] --- yaml --- r: 197244 b: refs/heads/master c:
 d18c5906d0914d911a13d342ff61a6bca6aff597 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/das1800.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9fc2a4590c4c..0e02be51013e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b74a9670857c2af74e36ecbd31bbc55ddd8e1311
+refs/heads/master: d18c5906d0914d911a13d342ff61a6bca6aff597
diff --git a/trunk/drivers/staging/comedi/drivers/das1800.c b/trunk/drivers/staging/comedi/drivers/das1800.c
index d91c2d9d595b..de5e82fec878 100644
--- a/trunk/drivers/staging/comedi/drivers/das1800.c
+++ b/trunk/drivers/staging/comedi/drivers/das1800.c
@@ -1637,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 */
@@ -1645,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;