diff --git a/[refs] b/[refs]
index 0af8a2c1a12a..3c3b4deeefaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13dd38d0814f36fce3a7ec9cb29a5ce6b0fc2522
+refs/heads/master: f59ab27b7a6fd760268f695078c739f3036b4edf
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index f0860532575a..e6dd6eaa8d68 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -251,6 +251,7 @@ void em2820_card_setup(struct em2820 *dev)
 #endif
 		/* Call first TVeeprom */
 
+		dev->i2c_client.addr = 0xa0 >> 1;
 		tveeprom_hauppauge_analog(&dev->i2c_client, &tv, dev->eedata);
 
 		dev->tuner_type= tv.tuner_type;