From 2b8827cf5f1e6615c8debfcd1e55613e73f30cac Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 22 Apr 2013 18:34:54 -0700
Subject: [PATCH] --- yaml --- r: 364191 b: refs/heads/master c:
 77630119ba0d64ddbe1c839adfd05483d403a0ac h: refs/heads/master i:   364189:
 525f889ef04b19a669e1410a16f20ac3ff11d256   364187:
 7c126777219e37e6865f9ceb91eecb886a0326a7   364183:
 c91b09f9438639937543fdedddd4dc92d32c9e70   364175:
 a35740f9ae9812ec295e2e2658bc533e5effed87   364159:
 83ca425297435a54384e5c1baf7df1d3c293e499 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/das800.c | 29 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index a9f39f0ec3ea..93a7e0f4a46c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bc405831d5bd83f263c2a0eac915ba5292d4cbe
+refs/heads/master: 77630119ba0d64ddbe1c839adfd05483d403a0ac
diff --git a/trunk/drivers/staging/comedi/drivers/das800.c b/trunk/drivers/staging/comedi/drivers/das800.c
index 3711f81321d9..78e913e3dfe3 100644
--- a/trunk/drivers/staging/comedi/drivers/das800.c
+++ b/trunk/drivers/staging/comedi/drivers/das800.c
@@ -412,12 +412,6 @@ static int das800_ai_do_cmd(struct comedi_device *dev,
 	unsigned long irq_flags;
 	struct comedi_async *async = s->async;
 
-	if (!dev->irq) {
-		comedi_error(dev,
-			     "no irq assigned for das-800, cannot do hardware conversions");
-		return -1;
-	}
-
 	disable_das800(dev);
 
 	/* set channel scan limits */
@@ -767,16 +761,19 @@ static int das800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 	/* analog input subdevice */
 	s = &dev->subdevices[0];
 	dev->read_subdev = s;
-	s->type = COMEDI_SUBD_AI;
-	s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_CMD_READ;
-	s->n_chan = 8;
-	s->len_chanlist = 8;
-	s->maxdata = (1 << thisboard->resolution) - 1;
-	s->range_table = thisboard->ai_range;
-	s->do_cmd = das800_ai_do_cmd;
-	s->do_cmdtest = das800_ai_do_cmdtest;
-	s->insn_read = das800_ai_rinsn;
-	s->cancel = das800_cancel;
+	s->type		= COMEDI_SUBD_AI;
+	s->subdev_flags	= SDF_READABLE | SDF_GROUND;
+	s->n_chan	= 8;
+	s->maxdata	= (1 << thisboard->resolution) - 1;
+	s->range_table	= thisboard->ai_range;
+	s->insn_read	= das800_ai_rinsn;
+	if (dev->irq) {
+		s->subdev_flags	|= SDF_CMD_READ;
+		s->len_chanlist	= 8;
+		s->do_cmdtest	= das800_ai_do_cmdtest;
+		s->do_cmd	= das800_ai_do_cmd;
+		s->cancel	= das800_cancel;
+	}
 
 	/* di */
 	s = &dev->subdevices[1];