V4L/DVB (5795): Fix: remove unused struct that could avoiding load the firmware

The dvb_usb_device* d is not used anymore and can be removed.

Signed-off-by: Marco Gittler <g.marco@freenet.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index ee6bf29223ff..cdb02218ca6a 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -534,18 +534,16 @@ static struct dvb_usb_device_properties opera1_properties = {
 static int opera1_probe(struct usb_interface *intf,
                         const struct usb_device_id *id)
 {
-        struct dvb_usb_device *d;
         struct usb_device *udev = interface_to_usbdev(intf);
 
         if (udev->descriptor.idProduct == USB_PID_OPERA1_WARM &&
                 udev->descriptor.idVendor == USB_VID_OPERA1 &&
-                (d == NULL
-                        || opera1_xilinx_load_firmware(udev, "dvb-usb-opera1-fpga.fw") != 0)
-                ) {
+                opera1_xilinx_load_firmware(udev, "dvb-usb-opera1-fpga.fw") != 0
+            ) {
                 return -EINVAL;
         }
 
-        if (dvb_usb_device_init(intf, &opera1_properties, THIS_MODULE, &d) != 0)
+        if (dvb_usb_device_init(intf, &opera1_properties, THIS_MODULE, NULL) != 0)
                 return -EINVAL;
         return 0;
 }