projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
615d5b6
)
Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register()
author
Roel Kluin
<roel.kluin@gmail.com>
Tue, 19 Jan 2010 20:46:48 +0000
(21:46 +0100)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Thu, 4 Mar 2010 00:42:46 +0000
(16:42 -0800)
Read from the right status register
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/ni_660x.c
patch
|
blob
|
history
diff --git
a/drivers/staging/comedi/drivers/ni_660x.c
b/drivers/staging/comedi/drivers/ni_660x.c
index 404d3c516ed18b0d8f282e13ebec8339e18d0757..1e2041447667f92b86e485e805c8439f79e614bd 100644
(file)
--- 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 = G
0
StatusRegister;
+ ni_660x_register = G
1
StatusRegister;
break;
case NITIO_G2_Status_Reg:
- ni_660x_register = G
0
StatusRegister;
+ ni_660x_register = G
2
StatusRegister;
break;
case NITIO_G3_Status_Reg:
- ni_660x_register = G
0
StatusRegister;
+ ni_660x_register = G
3
StatusRegister;
break;
case NITIO_G0_Interrupt_Enable_Reg:
ni_660x_register = G0InterruptEnable;