On Thu, Dec 12, 2013 at 11:32:19AM +0000, Ian Abbott wrote: > follow f6b316bcd8c421acd6fa5a6e18b4c846ecb9d965
Thank you Ian, I'm doing a cherry-pick on this commit for the 3.11. Cheers, -- Luis > > [Split from original patch subject: "staging: comedi: ssv_dnp: use > comedi_dio_update_state()"] > > Also, fix a bug where the state of the channels is returned in data[0]. > The comedi core expects it to be returned in data[1]. > > Signed-off-by: Ian Abbott <[email protected]> > --- > Applies to all stable kernels from 2.6.32.y to 3.12.y > --- > drivers/staging/comedi/drivers/ssv_dnp.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/ssv_dnp.c > b/drivers/staging/comedi/drivers/ssv_dnp.c > index 11758a5..0e687de 100644 > --- a/drivers/staging/comedi/drivers/ssv_dnp.c > +++ b/drivers/staging/comedi/drivers/ssv_dnp.c > @@ -83,11 +83,11 @@ static int dnp_dio_insn_bits(struct comedi_device *dev, > > /* on return, data[1] contains the value of the digital input lines. */ > outb(PADR, CSCIR); > - data[0] = inb(CSCDR); > + data[1] = inb(CSCDR); > outb(PBDR, CSCIR); > - data[0] += inb(CSCDR) << 8; > + data[1] += inb(CSCDR) << 8; > outb(PCDR, CSCIR); > - data[0] += ((inb(CSCDR) & 0xF0) << 12); > + data[1] += ((inb(CSCDR) & 0xF0) << 12); > > return insn->n; > > -- > 1.8.4.4 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to [email protected] > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
