summaryrefslogtreecommitdiff
path: root/drivers/media/video/tveeprom.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2006-11-09 23:25:28 +0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-11-13 13:17:28 +0300
commitfef4fa1475db6a53237e29451c88c15167d69cc4 (patch)
treed54376a7f93bb31777980f8ec9bdd59985c5cd0d /drivers/media/video/tveeprom.c
parent0871a8849b80646074cd28b2b078c8e002e51282 (diff)
downloadlinux-fef4fa1475db6a53237e29451c88c15167d69cc4.tar.xz
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>
Diffstat (limited to 'drivers/media/video/tveeprom.c')
-rw-r--r--drivers/media/video/tveeprom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e6baaee038bf..6b9ef731b83a 100644
--- a/drivers/media/video/tveeprom.c
+++ b/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;