From 668df9e1b0ef50132d3240e228534b8a68644c59 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 8 Jun 2012 09:52:58 +0300
Subject: [PATCH] --- yaml --- r: 317263 b: refs/heads/master c:
 f59f231e3db835353d8d1ff91062d89140dc8be3 h: refs/heads/master i:   317261:
 3047d1c3e3ef1a63008c9697431db72b52ff6472   317259:
 e316f13edf18ef3a536761de17494c99b646ff10   317255:
 21a0888f05ecba74d162ce5d1d1c445101ce3b05   317247:
 fb5d0a51e23a45226a9a42b80e262861ed3e0e5a v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/comedi/drivers/amplc_pci230.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38c99ee06bbc..9662638561e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27494c092a81847fef515549b76251d96b760619
+refs/heads/master: f59f231e3db835353d8d1ff91062d89140dc8be3
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci230.c b/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
index 30487be11650..f2ad35c6527d 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -1387,6 +1387,8 @@ static int pci230_ao_inttrig_scan_begin(struct comedi_device *dev,
 		/* Delay.  Should driver be responsible for this? */
 		/* XXX TODO: See if DAC busy bit can be used. */
 		udelay(8);
+	} else {
+		spin_unlock_irqrestore(&devpriv->ao_stop_spinlock, irqflags);
 	}
 
 	return 1;