]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: cb_das16_cs: fix analog output subdevice init
authorH Hartley Sweeten <hartleys@visionengravers.com>
Tue, 26 Jun 2012 00:10:30 +0000 (17:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jun 2012 22:30:52 +0000 (15:30 -0700)
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>
drivers/staging/comedi/drivers/cb_das16_cs.c

index f3d5ca00f14771431e46fa6a7c4efd474c4c7e41..acee5502356458ad15a6c9f77e6cc39d2c6ac94d 100644 (file)
@@ -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;