aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2005-11-09 00:37:09 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:15 -0500
commitfd35a6b454818e01f761622e9ac5824ce2d7baf5 (patch)
tree674d9b0a451801363af43d73c2f085476d62c821
parent3c1904a997153b17861bd331c9075017ba34b901 (diff)
[PATCH] v4l: 718: fixed build
- Fixed build. Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> 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>
-rw-r--r--drivers/media/video/em28xx/em28xx-i2c.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index 95f80a7615bd..f1493c48656b 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -279,10 +279,8 @@ static void dec_use(struct i2c_adapter *adap)
279static int em2820_set_tuner(int check_eeprom, struct i2c_client *client) 279static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
280{ 280{
281 struct em2820 *dev = client->adapter->algo_data; 281 struct em2820 *dev = client->adapter->algo_data;
282
283 struct tuner_setup tun_setup; 282 struct tuner_setup tun_setup;
284 283
285 /* tuner */
286 if (dev->has_tuner) { 284 if (dev->has_tuner) {
287 tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; 285 tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
288 tun_setup.type = dev->tuner_type; 286 tun_setup.type = dev->tuner_type;
@@ -290,6 +288,7 @@ static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
290 288
291 em2820_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); 289 em2820_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
292 } 290 }
291
293 return (0); 292 return (0);
294} 293}
295 294