diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-11-09 15:25:28 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-11-09 15:25:28 -0500 |
| commit | 01a7f6c31cadd4023bb5191132b4ab7e2894e01e (patch) | |
| tree | 86830663458663d5f41cede991f1d27bd388550f | |
| parent | 34cb94b040e62b8ae8bf3907b9dda12eb06c8095 (diff) | |
| download | mediapointer-dvb-s2-01a7f6c31cadd4023bb5191132b4ab7e2894e01e.tar.gz mediapointer-dvb-s2-01a7f6c31cadd4023bb5191132b4ab7e2894e01e.tar.bz2 | |
Fix uses of "&&" where "&" was intended
From: Jean Delvare <khali@linux-fr.org>
Fix uses of "&&" where "&" was intended in bttv-cards.c and tveeprom.c
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-cards.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-cards.c b/linux/drivers/media/video/bt8xx/bttv-cards.c index 2cdb6f340..2fecc20f3 100644 --- a/linux/drivers/media/video/bt8xx/bttv-cards.c +++ b/linux/drivers/media/video/bt8xx/bttv-cards.c @@ -4075,7 +4075,7 @@ static void __devinit init_PXC200(struct bttv *btv) * - sleep 1ms * - write 0x0E * read from GPIO_DATA into buf (uint_32) - * - if ( buf>>18 & 0x01 ) || ( buf>>19 && 0x01 != 0 ) + * - if ( buf>>18 & 0x01 ) || ( buf>>19 & 0x01 != 0 ) * error. ERROR_CPLD_Check_Failed. */ /* ----------------------------------------------------------------------- */ diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index f963cee12..2b290a731 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -472,7 +472,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, (eeprom_data[i+6] << 8) + (eeprom_data[i+7] << 16); - if ( (eeprom_data[i + 8] && 0xf0) && + if ( (eeprom_data[i + 8] & 0xf0) && (tvee->serial_number < 0xffffff) ) { tvee->MAC_address[0] = 0x00; tvee->MAC_address[1] = 0x0D; |