Skip to contentSkip to conversation

Staging: comedi: pcl730: fix some bitwise vs logical AND bugs

PATCH In review Dan Carpenter 2 participants 2 messages Nov 7, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: comedi: pcl730: fix some bitwise vs logical AND bugs

These conditions are never true because they use bitwise AND instead of logical ands.

Fixes b3ff824a81e8 ('staging: comedi: drivers: use comedi_dio_update_state() for complex cases')
drivers/staging/comedi/drivers/pcl730.c +3 -3
index d041b71..2baaf1d 100644
@@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
 	if (mask) {
 		if (mask & 0x00ff)
 			outb(s->state & 0xff, dev->iobase + reg);
-		if ((mask & 0xff00) & (s->n_chan > 8))
+		if ((mask & 0xff00) && (s->n_chan > 8))
 			outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
-		if ((mask & 0xff0000) & (s->n_chan > 16))
+		if ((mask & 0xff0000) && (s->n_chan > 16))
 			outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
-		if ((mask & 0xff000000) & (s->n_chan > 24))
+		if ((mask & 0xff000000) && (s->n_chan > 24))
 			outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
 	}
 
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Dan Carpenter

These conditions are never true because they use bitwise AND instead of logical ands.

Fixes b3ff824a81e8 ('staging: comedi: drivers: use comedi_dio_update_state() for complex cases')
drivers/staging/comedi/drivers/pcl730.c +0 -1
index d041b71..2baaf1d 100644
@@ -173,11 +173,11 @@ static int pcl730_do_insn_bits(struct comedi_device *dev,
  	if (mask) {
  		if (mask & 0x00ff)
  			outb(s->state & 0xff, dev->iobase + reg);
-		if ((mask & 0xff00) & (s->n_chan > 8))

drivers/staging/comedi/drivers/pcl730.c static int pcl730_do_insn_bits(struct comedi_device *dev, · line 183

Quoted 10 lines
drivers/staging/comedi/drivers/pcl730.c +3 -2
+		if ((mask & 0xff00) && (s->n_chan > 8))
  			outb((s->state >> 8) & 0xff, dev->iobase + reg + 1);
-		if ((mask & 0xff0000) & (s->n_chan > 16))
+		if ((mask & 0xff0000) && (s->n_chan > 16))
  			outb((s->state >> 16) & 0xff, dev->iobase + reg + 2);
-		if ((mask & 0xff000000) & (s->n_chan > 24))
+		if ((mask & 0xff000000) && (s->n_chan > 24))
  			outb((s->state >> 24) & 0xff, dev->iobase + reg + 3);
  	}
 
Signature · 2 lines
-=( Ian Abbott @ MEV Ltd.    E-mail: <[email protected]>        )=-
-=( Tel: +44 (0)161 477 1898   FAX: +44 (0)161 718 3587         )=-