From: Roel Kluin Date: Tue, 19 Jan 2010 20:46:48 +0000 (+0100) Subject: Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register() X-Git-Tag: MMI-PSA29.97-13-9~24618^2~1^2~181 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6c381c5775ea5eb799bdc790dd6d6d43fe966134;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register() Read from the right status register Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c index 404d3c516ed1..1e2041447667 100644 --- a/drivers/staging/comedi/drivers/ni_660x.c +++ b/drivers/staging/comedi/drivers/ni_660x.c @@ -691,13 +691,13 @@ static enum NI_660x_Register ni_gpct_to_660x_register(enum ni_gpct_register reg) ni_660x_register = G0StatusRegister; break; case NITIO_G1_Status_Reg: - ni_660x_register = G0StatusRegister; + ni_660x_register = G1StatusRegister; break; case NITIO_G2_Status_Reg: - ni_660x_register = G0StatusRegister; + ni_660x_register = G2StatusRegister; break; case NITIO_G3_Status_Reg: - ni_660x_register = G0StatusRegister; + ni_660x_register = G3StatusRegister; break; case NITIO_G0_Interrupt_Enable_Reg: ni_660x_register = G0InterruptEnable;