---

yaml --- r: 330560 b: refs/heads/master c: 1bf325d h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · dbaf61f · dbaf61f
1 parent 3ee6bd3
commit dbaf61f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc78693706b3efc7e1f7647a35d29736e6d2be3f
+refs/heads/master: 1bf325db6b668dcdb51753159c008da89f715411
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -462,7 +462,7 @@ struct dvb_usb_device {
 
 extern int dvb_usbv2_device_init(struct usb_interface *,
 			       struct dvb_usb_device_properties *,
-			       struct module *, struct dvb_usb_device **,
+			       struct module *,
 			       short *adapter_nums);
 extern void dvb_usbv2_device_exit(struct usb_interface *);
 

diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -235,7 +235,7 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff)
  */
 int dvb_usbv2_device_init(struct usb_interface *intf,
 			struct dvb_usb_device_properties *props,
-			struct module *owner, struct dvb_usb_device **du,
+			struct module *owner,
 			short *adapter_nums)
 {
 	struct usb_device *udev = interface_to_usbdev(intf);
@@ -244,9 +244,6 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 
 	int ret = -ENOMEM, cold = 0;
 
-	if (du != NULL)
-		*du = NULL;
-
 	if ((desc = dvb_usb_find_device(udev, props, &cold)) == NULL) {
 		deb_err("something went very wrong, device was not found in current device list - let's see what comes next.\n");
 		return -ENODEV;
@@ -273,9 +270,6 @@ int dvb_usbv2_device_init(struct usb_interface *intf,
 
 	usb_set_intfdata(intf, d);
 
-	if (du != NULL)
-		*du = d;
-
 	ret = dvb_usb_init(d, adapter_nums);
 
 	if (ret == 0)