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;