Commit 65871deb authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] dvb_usb_v2: use .driver_info to pass struct dvb_usb_device_properties 



Use struct usb_device_id .driver_info to pass struct dvb_usb_device_properties
pointer for the DVB USB.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1bf325db

drivers/media/dvb/dvb-usb/dvb_usb.h

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ struct dvb_usb_device { 
};



extern int dvb_usbv2_device_init(struct usb_interface *,

			       struct dvb_usb_device_properties *,

				const struct usb_device_id *,

			       struct module *,

			       short *adapter_nums);

extern void dvb_usbv2_device_exit(struct usb_interface *);

drivers/media/dvb/dvb-usb/dvb_usb_init.c

+3 −1
Original line number Diff line number Diff line
@@ -234,13 +234,15 @@ int dvb_usb_device_power_ctrl(struct dvb_usb_device *d, int onoff) 
 * USB

 */

int dvb_usbv2_device_init(struct usb_interface *intf,

			struct dvb_usb_device_properties *props,

			const struct usb_device_id *id,

			struct module *owner,

			short *adapter_nums)

{

	struct usb_device *udev = interface_to_usbdev(intf);

	struct dvb_usb_device *d = NULL;

	struct dvb_usb_device_description *desc = NULL;

	struct dvb_usb_device_properties *props =

			(struct dvb_usb_device_properties *) id->driver_info;



	int ret = -ENOMEM, cold = 0;