diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-09-09 02:02:08 +0300 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-09 09:49:03 -0500 |
| commit | 7ea95b110811fa8e41f5960c278bcfc80b8b21c1 (patch) | |
| tree | 7d3ac41dd7a19baba014ea06a9afabb903bbcf80 /drivers/usb/gadget/function/f_uvc.c | |
| parent | 70aacc5777d1f1ca0a88067c9121ce86441bc4e0 (diff) | |
| download | op-kernel-dev-7ea95b110811fa8e41f5960c278bcfc80b8b21c1.zip op-kernel-dev-7ea95b110811fa8e41f5960c278bcfc80b8b21c1.tar.gz | |
usb: gadget: uvc: rename functions to avoid conflicts with host uvc
Prepare for separate compilation of uvc function's components.
Some symbols will have to be exported, so rename to avoid
conflicts with functions of the same name in host uvc.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Tested-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
[Rename uvc_video_pump and uvc_queue_head as well]
[Rename forgotten uvc_queue_cancel instance in a comment]
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_uvc.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_uvc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 187c3a0..ae5bcb4 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -693,7 +693,7 @@ uvc_function_bind(struct usb_configuration *c, struct usb_function *f) } /* Initialise video. */ - ret = uvc_video_init(&uvc->video); + ret = uvcg_video_init(&uvc->video); if (ret < 0) goto error; |
