From 37510021cca26634ec3495dc75e3068a7c9be9d1 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Tue, 22 Apr 2008 14:42:13 -0300
Subject: [PATCH] --- yaml --- r: 92392 b: refs/heads/master c:
 f13613acfb1a71895ac886dc831d6ae4e20e241a h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/video/tuner-simple.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 90258b113f90..35c8d20ff679 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a6179b6db401acde5798b4da0fdff32b126ee15
+refs/heads/master: f13613acfb1a71895ac886dc831d6ae4e20e241a
diff --git a/trunk/drivers/media/video/tuner-simple.c b/trunk/drivers/media/video/tuner-simple.c
index dc2467159ece..ee5ef860700a 100644
--- a/trunk/drivers/media/video/tuner-simple.c
+++ b/trunk/drivers/media/video/tuner-simple.c
@@ -251,7 +251,7 @@ static int simple_config_lookup(struct dvb_frontend *fe,
 
 static int simple_std_setup(struct dvb_frontend *fe,
 			    struct analog_parameters *params,
-			    u8 *buffer, u8 *config, u8 *cb)
+			    u8 *config, u8 *cb)
 {
 	struct tuner_simple_priv *priv = fe->tuner_priv;
 	u8 tuneraddr;
@@ -323,14 +323,12 @@ static int simple_std_setup(struct dvb_frontend *fe,
 		break;
 
 	case TUNER_PHILIPS_TUV1236D:
+	{
 		/* 0x40 -> ATSC antenna input 1 */
 		/* 0x48 -> ATSC antenna input 2 */
 		/* 0x00 -> NTSC antenna input 1 */
 		/* 0x08 -> NTSC antenna input 2 */
-		buffer[0] = 0x14;
-		buffer[1] = 0x00;
-		buffer[2] = 0x17;
-		buffer[3] = 0x00;
+		u8 buffer[4] = { 0x14, 0x00, 0x17, 0x00};
 		*cb &= ~0x40;
 		if (params->std & V4L2_STD_ATSC) {
 			*cb |= 0x40;
@@ -351,6 +349,7 @@ static int simple_std_setup(struct dvb_frontend *fe,
 		/* FIXME: input */
 		break;
 	}
+	}
 
 	return 0;
 }
@@ -509,7 +508,7 @@ static int simple_set_tv_freq(struct dvb_frontend *fe,
 		  offset / 16, offset % 16 * 100 / 16, div);
 
 	/* tv norm specific stuff for multi-norm tuners */
-	simple_std_setup(fe, params, &buffer[1], &config, &cb);
+	simple_std_setup(fe, params, &config, &cb);
 
 	if (t_params->cb_first_if_lower_freq && div < priv->last_div) {
 		buffer[0] = config;