V4L/DVB: remove unneeded null check in anysee_probe()

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb / dvb-usb / anysee.c

diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index faca1ad88a67d382be3c7d10301c57d5a5a20735..aa5c7d5eef693ff73209b2514e08d9b2e02eba95 100644 (file)
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -463,6 +463,11 @@ static int anysee_probe(struct usb_interface *intf,
        if (intf->num_altsetting < 1)
                return -ENODEV;
 
+       /*
+        * Anysee is always warm (its USB-bridge, Cypress FX2, uploads
+        * firmware from eeprom).  If dvb_usb_device_init() succeeds that
+        * means d is a valid pointer.
+        */
        ret = dvb_usb_device_init(intf, &anysee_properties, THIS_MODULE, &d,
                adapter_nr);
        if (ret)
@@ -479,10 +484,7 @@ static int anysee_probe(struct usb_interface *intf,
        if (ret)
                return ret;
 
-       if (d)
-               ret = anysee_init(d);
-
-       return ret;
+       return anysee_init(d);
 }
 
 static struct usb_device_id anysee_table[] = {