From 3abc11ab04b2b903d0df0864074bc51ff10583ef Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 4 Feb 2011 12:56:39 -0300
Subject: [PATCH] --- yaml --- r: 241853 b: refs/heads/master c:
 900f734b3bafb4e111b9ec5d865c448a9911b2ab h: refs/heads/master i:   241851:
 e566daf441598541ddf489320337ff146245b9b4 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/media/video/tuner-core.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 20e55ea865b7..54d1eaf55fc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d275bf840a8f390b8fd3d686545e09ef01f7915
+refs/heads/master: 900f734b3bafb4e111b9ec5d865c448a9911b2ab
diff --git a/trunk/drivers/media/video/tuner-core.c b/trunk/drivers/media/video/tuner-core.c
index 70ff416c0ced..16939cad987c 100644
--- a/trunk/drivers/media/video/tuner-core.c
+++ b/trunk/drivers/media/video/tuner-core.c
@@ -66,7 +66,6 @@ module_param_string(ntsc, ntsc, sizeof(ntsc), 0644);
  * Static vars
  */
 
-static struct xc5000_config xc5000_cfg;
 static LIST_HEAD(tuner_list);
 
 /*
@@ -338,9 +337,12 @@ static void set_type(struct i2c_client *c, unsigned int type,
 		break;
 	case TUNER_XC5000:
 	{
-		xc5000_cfg.i2c_address	  = t->i2c->addr;
-		/* if_khz will be set when the digital dvb_attach() occurs */
-		xc5000_cfg.if_khz	  = 0;
+		struct xc5000_config xc5000_cfg = {
+			.i2c_address = t->i2c->addr,
+			/* if_khz will be set at dvb_attach() */
+			.if_khz	  = 0,
+		};
+
 		if (!dvb_attach(xc5000_attach,
 				&t->fe, t->i2c->adapter, &xc5000_cfg))
 			goto attach_failed;