lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 037/233] staging: comedi: addi_apci_1032: fix subdevice type/flags bug
    Date
    3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: H Hartley Sweeten <hsweeten@visionengravers.com>

    commit 90daf69a7a3f1d1a41018c799968a0bb896d65e0 upstream.

    The SDF_CMD_READ should be one of the s->subdev_flags not part of
    the s->type.

    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/staging/comedi/drivers/addi_apci_1032.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
    index 8a93542..ecc67a3 100644
    --- a/drivers/staging/comedi/drivers/addi_apci_1032.c
    +++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
    @@ -325,8 +325,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;
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-02-07 15:01    [W:2.714 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site