From 2e7044382da59d6a37c8adf67fd499437bd281a8 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Wed, 23 May 2012 13:40:57 -0300 Subject: [PATCH] --- yaml --- r: 330561 b: refs/heads/master c: 65871deb7d61e4da681fdefe13d04d3702544448 h: refs/heads/master i: 330559: 3ee6bd3fdd4bf9dd756a501a823240b303ab089f v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dvb_usb.h | 2 +- trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e8c990562d8d..15caeb00b025 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bf325db6b668dcdb51753159c008da89f715411 +refs/heads/master: 65871deb7d61e4da681fdefe13d04d3702544448 diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h index 1ee95c1f93e5..7f1f10989de4 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h +++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h @@ -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 *); diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c index 367d1600fb7b..93b45546181a 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c +++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c @@ -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;