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: Jean Delvare <khali@linux-fr.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
0871a8849b
commit
fef4fa1475
2 changed files with 2 additions and 2 deletions
|
@ -4001,7 +4001,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.
|
||||
*/
|
||||
/* ----------------------------------------------------------------------- */
|
||||
|
|
|
@ -468,7 +468,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;
|
||||
|
|
Loading…
Reference in a new issue