From: Michael Krufky <mkrufky@m1k.net>
Date: Wed, 9 Nov 2005 05:38:19 +0000 (-0800)
Subject: [PATCH] v4l: 869: iso c90 forbids mixed declarations and code
X-Git-Tag: v2.6.15-rc1~169
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4372beb84874ab33f2b06bd6a66ff6d07427081;p=linux-2.6

[PATCH] v4l: 869: iso c90 forbids mixed declarations and code

- ISO C90 forbids mixed declarations and code

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 34ba6d13b5..d832205818 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -299,7 +299,7 @@ static int tuner_stereo(struct i2c_client *c)
 static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 {
 	struct tuner *t = i2c_get_clientdata(c);
-	u8 config;
+	u8 config, tuneraddr;
 	u16 div;
 	struct tunertype *tun;
 	unsigned char buffer[4];
@@ -393,7 +393,6 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
 			buffer[1] = 0x04;
 		}
 		/* set to the correct mode (analog or digital) */
-		u8 tuneraddr;
 		tuneraddr = c->addr;
 		c->addr = 0x0a;
 		if (2 != (rc = i2c_master_send(c,&buffer[0],2)))