summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/opera1.c
diff options
context:
space:
mode:
authorMarco Gittler <g.marco@freenet.de>2007-06-28 10:10:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 14:24:23 -0300
commitd06cdbe59068a143ff2de2474fea62923cb7026f (patch)
treecf54cd6965fb2292b17c22cfd0bd568560a030f9 /drivers/media/dvb/dvb-usb/opera1.c
parent8218b0b2caecf4af55742e12e9986c15605bb197 (diff)
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>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/opera1.c')
-rw-r--r--drivers/media/dvb/dvb-usb/opera1.c8
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 ee6bf29223f..cdb02218ca6 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;
}