diff options
author | Patrick Boettcher <pb@linuxtv.org> | 2005-09-09 16:02:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 16:57:41 -0400 |
commit | 47dc3d688d04f06d8ef90a06c48930906fbc4a8c (patch) | |
tree | 705fc3f433180d96e357bdcf4814408169367018 /drivers/media/dvb/dvb-usb/dvb-usb-init.c | |
parent | 62703b9d72114a563488cd4be6d0827618395589 (diff) |
[PATCH] dvb: usb: core: change dvb_usb_device_init() API
Change the init call to optionally return the new dvb_usb_device directly.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-init.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-init.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-init.c b/drivers/media/dvb/dvb-usb/dvb-usb-init.c index ea1098a6c7a8..a902059812a2 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-init.c | |||
@@ -128,7 +128,9 @@ static struct dvb_usb_device_description * dvb_usb_find_device(struct usb_device | |||
128 | /* | 128 | /* |
129 | * USB | 129 | * USB |
130 | */ | 130 | */ |
131 | int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties *props, struct module *owner) | 131 | |
132 | int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties | ||
133 | *props, struct module *owner,struct dvb_usb_device **du) | ||
132 | { | 134 | { |
133 | struct usb_device *udev = interface_to_usbdev(intf); | 135 | struct usb_device *udev = interface_to_usbdev(intf); |
134 | struct dvb_usb_device *d = NULL; | 136 | struct dvb_usb_device *d = NULL; |
@@ -170,6 +172,9 @@ int dvb_usb_device_init(struct usb_interface *intf, struct dvb_usb_properties *p | |||
170 | 172 | ||
171 | usb_set_intfdata(intf, d); | 173 | usb_set_intfdata(intf, d); |
172 | 174 | ||
175 | if (du != NULL) | ||
176 | *du = d; | ||
177 | |||
173 | ret = dvb_usb_init(d); | 178 | ret = dvb_usb_init(d); |
174 | } | 179 | } |
175 | 180 | ||