projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb gadget: don't save bind callback in struct usb_composite_driver
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
usb
/
gadget
/
webcam.c
diff --git
a/drivers/usb/gadget/webcam.c
b/drivers/usb/gadget/webcam.c
index
de1deb7
..
de65b80
100644
(file)
--- a/
drivers/usb/gadget/webcam.c
+++ b/
drivers/usb/gadget/webcam.c
@@
-308,7
+308,7
@@
static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = {
* USB configuration
*/
* USB configuration
*/
-static int __
ref
+static int __
init
webcam_config_bind(struct usb_configuration *c)
{
return uvc_bind_config(c, uvc_control_cls, uvc_fs_streaming_cls,
webcam_config_bind(struct usb_configuration *c)
{
return uvc_bind_config(c, uvc_control_cls, uvc_fs_streaming_cls,
@@
-330,7
+330,7
@@
webcam_unbind(struct usb_composite_dev *cdev)
return 0;
}
return 0;
}
-static int __
ref
+static int __
init
webcam_bind(struct usb_composite_dev *cdev)
{
int ret;
webcam_bind(struct usb_composite_dev *cdev)
{
int ret;
@@
-373,14
+373,13
@@
static struct usb_composite_driver webcam_driver = {
.name = "g_webcam",
.dev = &webcam_device_descriptor,
.strings = webcam_device_strings,
.name = "g_webcam",
.dev = &webcam_device_descriptor,
.strings = webcam_device_strings,
- .bind = webcam_bind,
.unbind = webcam_unbind,
};
static int __init
webcam_init(void)
{
.unbind = webcam_unbind,
};
static int __init
webcam_init(void)
{
- return usb_composite_
register(&webcam_driver
);
+ return usb_composite_
probe(&webcam_driver, webcam_bind
);
}
static void __exit
}
static void __exit