From a3d22569f25bda0026a3f5f9e97d8bab6cd80801 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Thu, 29 Nov 2012 18:14:48 -0700 Subject: [PATCH] --- yaml --- r: 338287 b: refs/heads/master c: 0cbbbbb9f7044175457962fcf4c14de8df82775b h: refs/heads/master i: 338285: d358d7d224b8dba0e375705f1f2bf0d205f9c6c6 338283: 7e70bd68017b7e9bb130ae8c7014449fa9da1fb6 338279: be3f37cd0223fcbec8c7601a97f50c2693d4bbaa 338271: 95e6f31e4abba469c23b136ccd9cacda707306b6 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_2032.c | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index eadbdcf3fce0..00058aa7b96f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84987a16cae8986b54efa51a6a86533ebb511a68 +refs/heads/master: 0cbbbbb9f7044175457962fcf4c14de8df82775b diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c index 451c390aab11..9f44e7b68da3 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_2032.c @@ -225,22 +225,8 @@ static int apci2032_auto_attach(struct comedi_device *dev, } /* Allocate and Initialise DI Subdevice Structures */ s = &dev->subdevices[2]; - if (devpriv->s_EeParameters.i_NbrDiChannel) { - s->type = COMEDI_SUBD_DI; - s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON; - s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel; - s->maxdata = 1; - s->len_chanlist = - devpriv->s_EeParameters.i_NbrDiChannel; - s->range_table = &range_digital; - s->io_bits = 0; /* all bits input */ - s->insn_config = this_board->di_config; - s->insn_read = this_board->di_read; - s->insn_write = this_board->di_write; - s->insn_bits = this_board->di_bits; - } else { - s->type = COMEDI_SUBD_UNUSED; - } + s->type = COMEDI_SUBD_UNUSED; + /* Allocate and Initialise DO Subdevice Structures */ s = &dev->subdevices[3]; if (devpriv->s_EeParameters.i_NbrDoChannel) {