From e3b75403bc588e7baccc5e47f8f4561608b2e823 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Mon, 17 Sep 2012 17:54:27 -0300
Subject: [PATCH] --- yaml --- r: 331178 b: refs/heads/master c:
 3d8a60d5de1aefd40c8e874a9db342bc974c6031 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 37512c41e2be..29e352e24167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e688de0006dd02583332c14e07ab2560a92e37d
+refs/heads/master: 3d8a60d5de1aefd40c8e874a9db342bc974c6031
diff --git a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index f17e73baccff..70c2df1269d4 100644
--- a/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -583,6 +583,12 @@ static struct rtl2832_config rtl28xxu_rtl2832_tua9001_config = {
 	.tuner = TUNER_RTL2832_TUA9001,
 };
 
+static struct rtl2832_config rtl28xxu_rtl2832_e4000_config = {
+	.i2c_addr = 0x10, /* 0x20 */
+	.xtal = 28800000,
+	.tuner = TUNER_RTL2832_E4000,
+};
+
 static int rtl2832u_fc0012_tuner_callback(struct dvb_usb_device *d,
 		int cmd, int arg)
 {
@@ -720,8 +726,7 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
 		rtl2832_config = &rtl28xxu_rtl2832_tua9001_config;
 		break;
 	case TUNER_RTL2832_E4000:
-		/* FIXME: do not abuse fc0012 settings */
-		rtl2832_config = &rtl28xxu_rtl2832_fc0012_config;
+		rtl2832_config = &rtl28xxu_rtl2832_e4000_config;
 		break;
 	default:
 		dev_err(&d->udev->dev, "%s: unknown tuner=%s\n",