From 85d59972f29d6534156bdf10fc7774e4aafeea0c Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Tue, 8 Nov 2005 21:37:09 -0800 Subject: [PATCH] --- yaml --- r: 13331 b: refs/heads/master c: fd35a6b454818e01f761622e9ac5824ce2d7baf5 h: refs/heads/master i: 13329: 2b7096aca3e419b82d1ff8f1392c3c63cbbcc7f4 13327: 9fb4c6fcc456b3d89dc7836fa512b9375748d0d1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-i2c.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dfccd9eb181a..1dd777d2ada7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c1904a997153b17861bd331c9075017ba34b901 +refs/heads/master: fd35a6b454818e01f761622e9ac5824ce2d7baf5 diff --git a/trunk/drivers/media/video/em28xx/em28xx-i2c.c b/trunk/drivers/media/video/em28xx/em28xx-i2c.c index 95f80a7615bd..f1493c48656b 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-i2c.c +++ b/trunk/drivers/media/video/em28xx/em28xx-i2c.c @@ -279,10 +279,8 @@ static void dec_use(struct i2c_adapter *adap) static int em2820_set_tuner(int check_eeprom, struct i2c_client *client) { struct em2820 *dev = client->adapter->algo_data; - struct tuner_setup tun_setup; - /* tuner */ if (dev->has_tuner) { tun_setup.mode_mask = T_ANALOG_TV | T_RADIO; tun_setup.type = dev->tuner_type; @@ -290,6 +288,7 @@ static int em2820_set_tuner(int check_eeprom, struct i2c_client *client) em2820_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup); } + return (0); }