From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 26 Jun 2012 00:10:30 +0000 (-0700)
Subject: staging: comedi: cb_das16_cs: fix analog output subdevice init
X-Git-Tag: next-20120724~21^2~528
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da7fde2bc902db1133f591b826124c9369857d38;p=karo-tx-linux.git

staging: comedi: cb_das16_cs: fix analog output subdevice init

The analog output subdevice is only available on the -AO version
of the DAS16/16 device and the number of channels is provided in
the boardinfo. Make sure the subdevice is marked as unused for
devices that do not support the analog out.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c
index f3d5ca00f147..acee55023564 100644
--- a/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -509,6 +509,8 @@ static int das16cs_attach(struct comedi_device *dev,
 		s->range_table = &range_bipolar10;
 		s->insn_write = &das16cs_ao_winsn;
 		s->insn_read = &das16cs_ao_rinsn;
+	} else {
+		s->type = COMEDI_SUBD_UNUSED;
 	}
 
 	s = dev->subdevices + 2;