xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: uvc: rename functions to avoid conflicts with host uvc

Browse Source 
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>
This commit is contained in:
Andrzej Pietrasiewicz
2014-09-09 02:02:08 +03:00
committed by Felipe Balbi
parent 70aacc5777
commit 7ea95b1108
4 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/function/f_uvc.c
View File

@@ -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;