From ea8d62b2e67b7459e4aeb1dac5c360a493b77953 Mon Sep 17 00:00:00 2001
From: Markus Rechberger <mrechberger@gmail.com>
Date: Tue, 8 Nov 2005 21:37:20 -0800
Subject: [PATCH] --- yaml --- r: 13344 b: refs/heads/master c:
 a9ae9fb17bdcb22ae0c1abc6ebd97704dd80d9d1 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/video/em28xx/em28xx-i2c.c | 40 +++++++++----------
 .../drivers/media/video/em28xx/em28xx-video.c |  1 -
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 6bf8a8777da8..0e895b036d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18f47d10bc8076bb126a1a369b782e29cc91c824
+refs/heads/master: a9ae9fb17bdcb22ae0c1abc6ebd97704dd80d9d1
diff --git a/trunk/drivers/media/video/em28xx/em28xx-i2c.c b/trunk/drivers/media/video/em28xx/em28xx-i2c.c
index 150c72bb6e48..8551998dbaec 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-i2c.c
@@ -302,26 +302,26 @@ static int attach_inform(struct i2c_client *client)
 
 	dprintk("address %x", client->addr << 1);
 	switch (client->addr << 1) {
-	case 0x68:
-		em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
-		break;
-	case 0x4a:
-		dprintk1("attach_inform: saa7113 detected.\n");
-		break;
-	case 0xa0:
-		dprintk1("attach_inform: eeprom detected.\n");
-		break;
-	case 0x80:
-	case 0x88:
-		dprintk1("attach_inform: msp34xx detected.\n");
-		break;
-	case 0xb8:
-	case 0xba:
-		dprintk1("attach_inform: tvp5150 detected.\n");
-		break;
-	default:
-		dev->tuner_addr = client->addr;
-		em2820_set_tuner(-1, client);
+		case 0x86:
+			em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
+			break;
+		case 0x4a:
+			dprintk1("attach_inform: saa7113 detected.\n");
+			break;
+		case 0xa0:
+			dprintk1("attach_inform: eeprom detected.\n");
+			break;
+		case 0x80:
+		case 0x88:
+			dprintk1("attach_inform: msp34xx detected.\n");
+			break;
+		case 0xb8:
+		case 0xba:
+			dprintk1("attach_inform: tvp5150 detected.\n");
+			break;
+		default:
+			dev->tuner_addr = client->addr;
+			em2820_set_tuner(-1, client);
 	}
 
 	return 0;
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 3581fc4c874d..7e4114ea15f9 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -225,7 +225,6 @@ void em2820_config_i2c(struct em2820 *dev)
 
 	/* configure tda9887 */
 
-	em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
 
 /*	em2820_i2c_call_clients(dev,VIDIOC_S_STD,&dev->tvnorm->id); */
 }