Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/dvb/dvb-usb/opera1.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

}