summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPatrick Boettcher <pboettcher@kernellabs.com>2011-04-03 12:44:25 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-04-04 15:58:20 -0300
commit71682520b33abef3f6c3fb618cb530826f472476 (patch)
tree7e389982f1b48a96d99e2540796fc17c5898191b /drivers/media
parentb934c20de1398d4a82d2ecfeb588a214a910f13f (diff)
downloadblackbird-op-linux-71682520b33abef3f6c3fb618cb530826f472476.tar.gz
blackbird-op-linux-71682520b33abef3f6c3fb618cb530826f472476.zip
[media] dib0700: fix possible NULL pointer dereference
Seems like 'adap->fe' test for NULL was meant to be before we dereference that pointer. Signed-off-by: Mariusz Kozlowski <mk@lab.zgora.pl> Signed-off-by: Patrick Boettcher <pboettcher@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_devices.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
index 72e2370c99fe..65214af5cd74 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
@@ -2440,11 +2440,11 @@ static int tfe7090pvr_frontend0_attach(struct dvb_usb_adapter *adap)
dib0700_set_i2c_speed(adap->dev, 340);
adap->fe = dvb_attach(dib7000p_attach, &adap->dev->i2c_adap, 0x90, &tfe7090pvr_dib7000p_config[0]);
- dib7090_slave_reset(adap->fe);
-
if (adap->fe == NULL)
return -ENODEV;
+ dib7090_slave_reset(adap->fe);
+
return 0;
}
OpenPOWER on IntegriCloud