Merge branch 'vuplus-1.6' of 192.168.102.66:/var/ikseong/repo/openembedded into test_0921
[vuplus_openembedded] / recipes / v4l-dvb / files / backport-5.patch
1 commit 8a1147ee8a19ec6e2437bbb73d549ce8670a38e5
2 Author: Andreas Oberritter <obi@linuxtv.org>
3 Date:   Sun May 8 20:03:38 2011 -0300
4
5     [media] DVB: dvb_frontend: remove unused assignments
6     
7     Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
8     Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
9
10 diff -Naur a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
11 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-09 18:54:28.720224016 +0200
12 +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-09 18:54:36.168223926 +0200
13 @@ -625,11 +625,9 @@
14                                 dvb_frontend_swzigzag(fe);
15                                 break;
16                         case DVBFE_ALGO_CUSTOM:
17 -                               params = NULL; /* have we been asked to RETUNE ?        */
18                                 dprintk("%s: Frontend ALGO = DVBFE_ALGO_CUSTOM, state=%d\n", __func__, fepriv->state);
19                                 if (fepriv->state & FESTATE_RETUNE) {
20                                         dprintk("%s: Retune requested, FESTAT_RETUNE\n", __func__);
21 -                                       params = &fepriv->parameters_in;
22                                         fepriv->state = FESTATE_TUNED;
23                                 }
24                                 /* Case where we are going to search for a carrier