summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-06-28 10:10:00 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-06-28 10:10:00 -0300
commitf141fe417cfa79dc3ed46e4fa1ed4961bd2d67d9 (patch)
tree9ac125ef413ae17b24d0869e99821f6481435463
parente7634d27b783d7a3fb9e4ee16339643468ef7b79 (diff)
downloadmediapointer-dvb-s2-f141fe417cfa79dc3ed46e4fa1ed4961bd2d67d9.tar.gz
mediapointer-dvb-s2-f141fe417cfa79dc3ed46e4fa1ed4961bd2d67d9.tar.bz2
Fix: remove unused struct that could avoiding load the firmware
From: Marco Gittler <g.marco@freenet.de> 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>
-rw-r--r--linux/drivers/media/dvb/dvb-usb/opera1.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/opera1.c b/linux/drivers/media/dvb/dvb-usb/opera1.c
index b8085617c..b3745f9eb 100644
--- a/linux/drivers/media/dvb/dvb-usb/opera1.c
+++ b/linux/drivers/media/dvb/dvb-usb/opera1.c
@@ -545,18 +545,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;
}