Merge branch 'vuplus-1.6' of 192.168.102.66:/var/ikseong/repo/openembedded into test_0921
[vuplus_openembedded] / recipes / v4l-dvb / files / backport-i.patch
1 From 825726e9eba24dbfaf5ebb6be966b65436aa11e3 Mon Sep 17 00:00:00 2001
2 From: Andreas Oberritter <obi@linuxtv.org>
3 Date: Wed, 24 Aug 2011 14:10:35 +0000
4 Subject: [PATCH 2/2] DVB: dvb_frontend: check function pointers on reinitialize
5
6 Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
7 ---
8  drivers/media/dvb/dvb-core/dvb_frontend.c |    6 ++----
9  1 files changed, 2 insertions(+), 4 deletions(-)
10
11 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-24 16:24:55.000000000 +0200
12 +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c 2011-08-24 16:28:12.540275301 +0200
13 @@ -590,12 +590,10 @@
14  
15                 if (fepriv->reinitialise) {
16                         dvb_frontend_init(fe);
17 -                       if (fepriv->tone != -1) {
18 +                       if (fe->ops.set_tone && fepriv->tone != -1)
19                                 fe->ops.set_tone(fe, fepriv->tone);
20 -                       }
21 -                       if (fepriv->voltage != -1) {
22 +                       if (fe->ops.set_voltage && fepriv->voltage != -1)
23                                 fe->ops.set_voltage(fe, fepriv->voltage);
24 -                       }
25                         fepriv->reinitialise = 0;
26                 }
27