Commit fef4fa14 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab

V4L/DVB (4817): Fix uses of "&&" where "&" was intended

Fix uses of "&&" where "&" was intended in bttv-cards.c and tveeprom.c
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 0871a884
...@@ -4001,7 +4001,7 @@ static void __devinit init_PXC200(struct bttv *btv) ...@@ -4001,7 +4001,7 @@ static void __devinit init_PXC200(struct bttv *btv)
* - sleep 1ms * - sleep 1ms
* - write 0x0E * - write 0x0E
* read from GPIO_DATA into buf (uint_32) * 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. * error. ERROR_CPLD_Check_Failed.
*/ */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
......
...@@ -468,7 +468,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee, ...@@ -468,7 +468,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
(eeprom_data[i+6] << 8) + (eeprom_data[i+6] << 8) +
(eeprom_data[i+7] << 16); (eeprom_data[i+7] << 16);
if ( (eeprom_data[i + 8] && 0xf0) && if ( (eeprom_data[i + 8] & 0xf0) &&
(tvee->serial_number < 0xffffff) ) { (tvee->serial_number < 0xffffff) ) {
tvee->MAC_address[0] = 0x00; tvee->MAC_address[0] = 0x00;
tvee->MAC_address[1] = 0x0D; tvee->MAC_address[1] = 0x0D;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment