From 00d58cbf41c24995c4d4cdd45e11beb71c7981d9 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 9 Nov 2006 17:25:28 -0300
Subject: [PATCH] --- yaml --- r: 40885 b: refs/heads/master c:
 fef4fa1475db6a53237e29451c88c15167d69cc4 h: refs/heads/master i:   40883:
 754dac542c35cdaf354d17e1e0f1f3af5de9b824 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/bt8xx/bttv-cards.c | 2 +-
 trunk/drivers/media/video/tveeprom.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 133714f9b79e..89e14312284b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0871a8849b80646074cd28b2b078c8e002e51282
+refs/heads/master: fef4fa1475db6a53237e29451c88c15167d69cc4
diff --git a/trunk/drivers/media/video/bt8xx/bttv-cards.c b/trunk/drivers/media/video/bt8xx/bttv-cards.c
index a84903e0d810..21ebe8f13815 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-cards.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-cards.c
@@ -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.
  */
 /* ----------------------------------------------------------------------- */
diff --git a/trunk/drivers/media/video/tveeprom.c b/trunk/drivers/media/video/tveeprom.c
index e6baaee038bf..6b9ef731b83a 100644
--- a/trunk/drivers/media/video/tveeprom.c
+++ b/trunk/drivers/media/video/tveeprom.c
@@ -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;