diff options
author | Michael Krufky <mkrufky@m1k.net> | 2005-11-09 00:38:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:26 -0500 |
commit | f4372beb84874ab33f2b06bd6a66ff6d07427081 (patch) | |
tree | 6db8d682f60dd2ae2afb6582ddfd2f7ad75bf752 /drivers/media | |
parent | fde6d31e19addca8be17dee7f47ad0a7fcaa79ca (diff) |
[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.c | 3 |
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) | |||
299 | static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | 299 | static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) |
300 | { | 300 | { |
301 | struct tuner *t = i2c_get_clientdata(c); | 301 | struct tuner *t = i2c_get_clientdata(c); |
302 | u8 config; | 302 | u8 config, tuneraddr; |
303 | u16 div; | 303 | u16 div; |
304 | struct tunertype *tun; | 304 | struct tunertype *tun; |
305 | unsigned char buffer[4]; | 305 | unsigned char buffer[4]; |
@@ -393,7 +393,6 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq) | |||
393 | buffer[1] = 0x04; | 393 | buffer[1] = 0x04; |
394 | } | 394 | } |
395 | /* set to the correct mode (analog or digital) */ | 395 | /* set to the correct mode (analog or digital) */ |
396 | u8 tuneraddr; | ||
397 | tuneraddr = c->addr; | 396 | tuneraddr = c->addr; |
398 | c->addr = 0x0a; | 397 | c->addr = 0x0a; |
399 | if (2 != (rc = i2c_master_send(c,&buffer[0],2))) | 398 | if (2 != (rc = i2c_master_send(c,&buffer[0],2))) |