Pārlūkot izejas kodu

Staging: comedi: initialize divisor variables

The i8253_cascade_ns_to_timer_2div() function (and
i8253_cascade_ns_to_timer macro) checks the old values *d1 and *d2
for correctness as a heuristic before calculating new values.  Don't
call the function with uninitialized values in *d1 and *d2.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ian Abbott 15 gadi atpakaļ
vecāks
revīzija
48b1aff5b9

+ 1 - 1
drivers/staging/comedi/drivers/adl_pci9118.c

@@ -780,7 +780,7 @@ static int pci9118_ai_cmdtest(struct comedi_device *dev,
 			      struct comedi_cmd *cmd)
 			      struct comedi_cmd *cmd)
 {
 {
 	int err = 0;
 	int err = 0;
-	int tmp, divisor1, divisor2;
+	int tmp, divisor1 = 0, divisor2 = 0;
 
 
 	/* step 1: make sure trigger sources are trivially valid */
 	/* step 1: make sure trigger sources are trivially valid */
 
 

+ 2 - 2
drivers/staging/comedi/drivers/adv_pci1710.c

@@ -830,7 +830,7 @@ static irqreturn_t interrupt_service_pci1710(int irq, void *d)
 static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
 static int pci171x_ai_docmd_and_mode(int mode, struct comedi_device *dev,
 				     struct comedi_subdevice *s)
 				     struct comedi_subdevice *s)
 {
 {
-	unsigned int divisor1, divisor2;
+	unsigned int divisor1 = 0, divisor2 = 0;
 	unsigned int seglen;
 	unsigned int seglen;
 
 
 	DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_docmd_and_mode(%d,...)\n",
 	DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_docmd_and_mode(%d,...)\n",
@@ -934,7 +934,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev,
 			      struct comedi_cmd *cmd)
 			      struct comedi_cmd *cmd)
 {
 {
 	int err = 0;
 	int err = 0;
-	int tmp, divisor1, divisor2;
+	int tmp, divisor1 = 0, divisor2 = 0;
 
 
 	DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...)\n");
 	DPRINTK("adv_pci1710 EDBG: BGN: pci171x_ai_cmdtest(...)\n");
 #ifdef PCI171X_EXTDEBUG
 #ifdef PCI171X_EXTDEBUG

+ 2 - 2
drivers/staging/comedi/drivers/cb_das16_cs.c

@@ -452,7 +452,7 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
 	/* step 4: fix up any arguments */
 	/* step 4: fix up any arguments */
 
 
 	if (cmd->scan_begin_src == TRIG_TIMER) {
 	if (cmd->scan_begin_src == TRIG_TIMER) {
-		unsigned int div1, div2;
+		unsigned int div1 = 0, div2 = 0;
 
 
 		tmp = cmd->scan_begin_arg;
 		tmp = cmd->scan_begin_arg;
 		i8253_cascade_ns_to_timer(100, &div1, &div2,
 		i8253_cascade_ns_to_timer(100, &div1, &div2,
@@ -462,7 +462,7 @@ static int das16cs_ai_cmdtest(struct comedi_device *dev,
 			err++;
 			err++;
 	}
 	}
 	if (cmd->convert_src == TRIG_TIMER) {
 	if (cmd->convert_src == TRIG_TIMER) {
-		unsigned int div1, div2;
+		unsigned int div1 = 0, div2 = 0;
 
 
 		tmp = cmd->convert_arg;
 		tmp = cmd->convert_arg;
 		i8253_cascade_ns_to_timer(100, &div1, &div2,
 		i8253_cascade_ns_to_timer(100, &div1, &div2,

+ 1 - 0
drivers/staging/comedi/drivers/pcl711.c

@@ -407,6 +407,7 @@ static int pcl711_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 		 *  0xb4 = Select Counter 2 | LSB/MSB | Mode=2 | Binary
 		 *  0xb4 = Select Counter 2 | LSB/MSB | Mode=2 | Binary
 		 */
 		 */
 
 
+		timer1 = timer2 = 0;
 		i8253_cascade_ns_to_timer(i8253_osc_base, &timer1, &timer2,
 		i8253_cascade_ns_to_timer(i8253_osc_base, &timer1, &timer2,
 					  &cmd->scan_begin_arg,
 					  &cmd->scan_begin_arg,
 					  TRIG_ROUND_NEAREST);
 					  TRIG_ROUND_NEAREST);

+ 1 - 1
drivers/staging/comedi/drivers/pcl816.c

@@ -472,7 +472,7 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
 			     struct comedi_subdevice *s, struct comedi_cmd *cmd)
 			     struct comedi_subdevice *s, struct comedi_cmd *cmd)
 {
 {
 	int err = 0;
 	int err = 0;
-	int tmp, divisor1, divisor2;
+	int tmp, divisor1 = 0, divisor2 = 0;
 
 
 	DEBUG(printk("pcl816 pcl812_ai_cmdtest\n"); pcl816_cmdtest_out(-1, cmd);
 	DEBUG(printk("pcl816 pcl812_ai_cmdtest\n"); pcl816_cmdtest_out(-1, cmd);
 	    );
 	    );

+ 3 - 3
drivers/staging/comedi/drivers/pcl818.c

@@ -970,7 +970,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
 			      struct comedi_subdevice *s)
 			      struct comedi_subdevice *s)
 {
 {
 	struct comedi_cmd *cmd = &s->async->cmd;
 	struct comedi_cmd *cmd = &s->async->cmd;
-	int divisor1, divisor2;
+	int divisor1 = 0, divisor2 = 0;
 	unsigned int seglen;
 	unsigned int seglen;
 
 
 	printk("pcl818_ai_cmd_mode()\n");
 	printk("pcl818_ai_cmd_mode()\n");
@@ -1089,7 +1089,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev,
 static int pcl818_ao_mode13(int mode, struct comedi_device *dev,
 static int pcl818_ao_mode13(int mode, struct comedi_device *dev,
 			    struct comedi_subdevice *s, comedi_trig * it)
 			    struct comedi_subdevice *s, comedi_trig * it)
 {
 {
-	int divisor1, divisor2;
+	int divisor1 = 0, divisor2 = 0;
 
 
 	if (!dev->irq) {
 	if (!dev->irq) {
 		comedi_error(dev, "IRQ not defined!");
 		comedi_error(dev, "IRQ not defined!");
@@ -1287,7 +1287,7 @@ static int ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
 		      struct comedi_cmd *cmd)
 		      struct comedi_cmd *cmd)
 {
 {
 	int err = 0;
 	int err = 0;
-	int tmp, divisor1, divisor2;
+	int tmp, divisor1 = 0, divisor2 = 0;
 
 
 	/* step 1: make sure trigger sources are trivially valid */
 	/* step 1: make sure trigger sources are trivially valid */