]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] dib0700: fix possible NULL pointer dereference
authorPatrick Boettcher <pboettcher@kernellabs.com>
Sun, 3 Apr 2011 15:44:25 +0000 (12:44 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 4 Apr 2011 18:58:20 +0000 (15:58 -0300)
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>
drivers/media/dvb/dvb-usb/dib0700_devices.c

index 72e2370c99feea36813f526052204dc4b37bf758..65214af5cd741ddd6a5f18978350673339eab84c 100644 (file)
@@ -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;
 }