Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef4fa14 authored Nov 09, 2006 by Jean Delvare Committed by Mauro Carvalho Chehab Nov 13, 2006

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>

parent 0871a884

drivers/media/video/bt8xx/bttv-cards.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*/
		/* ----------------------------------------------------------------------- */

drivers/media/video/tveeprom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;