Skip to content

Commit

Permalink
V4L/DVB (5795): Fix: remove unused struct that could avoiding load th…
Browse files Browse the repository at this point in the history
…e 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>
  • Loading branch information
Marco Gittler authored and Mauro Carvalho Chehab committed Jul 18, 2007
1 parent 8218b0b commit d06cdbe
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/media/dvb/dvb-usb/opera1.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit d06cdbe

Please sign in to comment.