Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / comedi / drivers / addi-data / hwdrv_apci1500.c

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index 2a8a6c73092050f553e0cbb6b562e735e034630c..62f421a06f0517dbc988cbd689689563c3c51b03 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -2850,7 +2850,7 @@ static int i_APCI1500_Reset(struct comedi_device *dev)
        i_Logic = 0;
        i_CounterLogic = 0;
        i_InterruptMask = 0;
-       i_InputChannel = 0;;
+       i_InputChannel = 0;
        i_TimerCounter1Enabled = 0;
        i_TimerCounter2Enabled = 0;
        i_WatchdogCounter3Enabled = 0;