Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / staging / comedi / drivers / addi_apci_1032.c

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 3d4878facc26994a5e31de3d52375acbe2358ad8..d919a9863e0190ba9eb03c9dcee139336e8536b4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -332,8 +332,8 @@ static int apci1032_auto_attach(struct comedi_device *dev,
        s = &dev->subdevices[1];
        if (dev->irq) {
                dev->read_subdev = s;
-               s->type         = COMEDI_SUBD_DI | SDF_CMD_READ;
-               s->subdev_flags = SDF_READABLE;
+               s->type         = COMEDI_SUBD_DI;
+               s->subdev_flags = SDF_READABLE | SDF_CMD_READ;
                s->n_chan       = 1;
                s->maxdata      = 1;
                s->range_table  = &range_digital;