mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 13:11:40 +00:00
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>
This commit is contained in:
parent
8218b0b2ca
commit
d06cdbe590
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user