summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@m1k.net>2005-11-09 08:38:19 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 18:56:26 +0300
commitf4372beb84874ab33f2b06bd6a66ff6d07427081 (patch)
tree6db8d682f60dd2ae2afb6582ddfd2f7ad75bf752 /drivers/media
parentfde6d31e19addca8be17dee7f47ad0a7fcaa79ca (diff)
downloadlinux-f4372beb84874ab33f2b06bd6a66ff6d07427081.tar.xz
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/tuner-simple.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 34ba6d13b586..d832205818f2 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)))