diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index f848840c8a85..fd9ee77aee52 100644
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -76,7 +76,7 @@ struct tm6000_board tm6000_boards[] = {
 		.name         = "Generic tm5600 board",
 		.type         = TM5600,
 		.tuner_type   = TUNER_XC2028,
-		.tuner_addr   = 0xc2,
+		.tuner_addr   = 0xc2 >> 1,
 		.caps = {
 			.has_tuner	= 1,
 		},
@@ -85,7 +85,7 @@ struct tm6000_board tm6000_boards[] = {
 	[TM6000_BOARD_GENERIC] = {
 		.name         = "Generic tm6000 board",
 		.tuner_type   = TUNER_XC2028,
-		.tuner_addr   = 0xc2,
+		.tuner_addr   = 0xc2 >> 1,
 		.caps = {
 			.has_tuner	= 1,
 			.has_dvb	= 1,
@@ -96,7 +96,7 @@ struct tm6000_board tm6000_boards[] = {
 		.name         = "Generic tm6010 board",
 		.type         = TM6010,
 		.tuner_type   = TUNER_XC2028,
-		.tuner_addr   = 0xc2,
+		.tuner_addr   = 0xc2 >> 1,
 		.caps = {
 			.has_tuner	= 1,
 			.has_dvb	= 1,
@@ -107,7 +107,7 @@ struct tm6000_board tm6000_boards[] = {
 		.name         = "10Moons UT 821",
 		.tuner_type   = TUNER_XC2028,
 		.type         = TM5600,
-		.tuner_addr   = 0xc2,
+		.tuner_addr   = 0xc2 >> 1,
 		.caps = {
 			.has_tuner    = 1,
 			.has_eeprom   = 1,
@@ -117,7 +117,7 @@ struct tm6000_board tm6000_boards[] = {
 	[TM5600_BOARD_10MOONS_UT330] = {
 		.name         = "10Moons UT 330",
 		.tuner_type   = TUNER_PHILIPS_FQ1216AME_MK4,
-		.tuner_addr   = 0xc8,
+		.tuner_addr   = 0xc8 >> 1,
 		.caps = {
 			.has_tuner    = 1,
 			.has_dvb      = 0,
@@ -128,7 +128,7 @@ struct tm6000_board tm6000_boards[] = {
 	[TM6000_BOARD_ADSTECH_DUAL_TV] = {
 		.name         = "ADSTECH Dual TV USB",
 		.tuner_type   = TUNER_XC2028,
-		.tuner_addr   = 0xc8,
+		.tuner_addr   = 0xc8 >> 1,
 		.caps = {
 			.has_tuner    = 1,
 			.has_tda9874  = 1,
@@ -140,8 +140,8 @@ struct tm6000_board tm6000_boards[] = {
 	[TM6000_BOARD_FREECOM_AND_SIMILAR] = {
 		.name         = "Freecom Hybrid Stick / Moka DVB-T Receiver Dual",
 		.tuner_type   = TUNER_XC2028, /* has a XC3028 */
-		.tuner_addr   = 0xc2,
-		.demod_addr   = 0x1e,
+		.tuner_addr   = 0xc2 >> 1,
+		.demod_addr   = 0x1e >> 1,
 		.caps = {
 			.has_tuner    = 1,
 			.has_dvb      = 1,
@@ -154,8 +154,8 @@ struct tm6000_board tm6000_boards[] = {
 	[TM6000_BOARD_ADSTECH_MINI_DUAL_TV] = {
 		.name         = "ADSTECH Mini Dual TV USB",
 		.tuner_type   = TUNER_XC2028, /* has a XC3028 */
-		.tuner_addr   = 0xc8,
-		.demod_addr   = 0x1e,
+		.tuner_addr   = 0xc8 >> 1,
+		.demod_addr   = 0x1e >> 1,
 		.caps = {
 			.has_tuner    = 1,
 			.has_dvb      = 1,
@@ -167,8 +167,8 @@ struct tm6000_board tm6000_boards[] = {
 	[TM6010_BOARD_HAUPPAUGE_900H] = {
 		.name         = "Hauppauge HVR-900H",
 		.tuner_type   = TUNER_XC2028, /* has a XC3028 */
-		.tuner_addr   = 0xc2,
-		.demod_addr   = 0x1e,
+		.tuner_addr   = 0xc2 >> 1,
+		.demod_addr   = 0x1e >> 1,
 		.type         = TM6010,
 		.caps = {
 			.has_tuner    = 1,