On Tue, 2014-01-21 at 13:45 +0000, Ian Abbott wrote:
> From: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Ian Abbott <abbotti@xxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> Applies to stable kernels 3.8.y to 3.13.y inclusive.
> ---
Thanks Ian. Queued up for 3.8.y-stable.
-Kamal
> 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 34ab067..b95a8b3 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;
Attachment:
signature.asc
Description: This is a digitally signed message part