From df61addcb7a93e83d74a7dc9f8c15fc237dac73c Mon Sep 17 00:00:00 2001 From: Marco Gittler Date: Thu, 28 Jun 2007 10:10:00 -0300 Subject: [PATCH] --- yaml --- r: 61349 b: refs/heads/master c: d06cdbe59068a143ff2de2474fea62923cb7026f h: refs/heads/master i: 61347: ed4de89c4b0b9c49d9e23c7ce46f807e507b57ed v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/opera1.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1494b8df8d1f..890cbcbc94f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8218b0b2caecf4af55742e12e9986c15605bb197 +refs/heads/master: d06cdbe59068a143ff2de2474fea62923cb7026f diff --git a/trunk/drivers/media/dvb/dvb-usb/opera1.c b/trunk/drivers/media/dvb/dvb-usb/opera1.c index ee6bf29223ff..cdb02218ca6a 100644 --- a/trunk/drivers/media/dvb/dvb-usb/opera1.c +++ b/trunk/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; }