---

yaml --- r: 337318 b: refs/heads/master c: 43d51f8 h: refs/heads/master v: v3
git-mirror · Oct 26, 2012 · 47d061a · 47d061a
1 parent 4ffb4b4
commit 47d061a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10cba302edf32753a653659740e1688094f92c86
+refs/heads/master: 43d51f885a1e0901229ad479b61ed97aa2c103f6
diff --git a/trunk/drivers/staging/comedi/drivers/me_daq.c b/trunk/drivers/staging/comedi/drivers/me_daq.c
@@ -735,14 +735,18 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
 	s->do_cmd = me_ai_do_cmd;
 
 	s = &dev->subdevices[1];
-	s->type = COMEDI_SUBD_AO;
-	s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
-	s->n_chan = board->ao_channel_nbr;
-	s->maxdata = board->ao_resolution_mask;
-	s->len_chanlist = board->ao_channel_nbr;
-	s->range_table = board->ao_range_list;
-	s->insn_read = me_ao_insn_read;
-	s->insn_write = me_ao_insn_write;
+	if (board->ao_channel_nbr) {
+		s->type = COMEDI_SUBD_AO;
+		s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
+		s->n_chan = board->ao_channel_nbr;
+		s->maxdata = board->ao_resolution_mask;
+		s->len_chanlist = board->ao_channel_nbr;
+		s->range_table = board->ao_range_list;
+		s->insn_read = me_ao_insn_read;
+		s->insn_write = me_ao_insn_write;
+	} else {
+		s->type = COMEDI_SUBD_UNUSED;
+	}
 
 	s = &dev->subdevices[2];
 	s->type = COMEDI_SUBD_DIO;