Commit d06cdbe5 authored by Marco Gittler's avatar Marco Gittler Committed by Mauro Carvalho Chehab

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: default avatarMarco Gittler <g.marco@freenet.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 8218b0b2
...@@ -534,18 +534,16 @@ static struct dvb_usb_device_properties opera1_properties = { ...@@ -534,18 +534,16 @@ static struct dvb_usb_device_properties opera1_properties = {
static int opera1_probe(struct usb_interface *intf, static int opera1_probe(struct usb_interface *intf,
const struct usb_device_id *id) const struct usb_device_id *id)
{ {
struct dvb_usb_device *d;
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
if (udev->descriptor.idProduct == USB_PID_OPERA1_WARM && if (udev->descriptor.idProduct == USB_PID_OPERA1_WARM &&
udev->descriptor.idVendor == USB_VID_OPERA1 && 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; 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 -EINVAL;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment