[PATCH] v4l: 869: iso c90 forbids mixed declarations and code
authorMichael Krufky <mkrufky@m1k.net>
Wed, 9 Nov 2005 05:38:19 +0000 (21:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:26 +0000 (07:56 -0800)
- 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>
drivers/media/video/tuner-simple.c

index 34ba6d1..d832205 100644 (file)
@@ -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)))