Patch "usb: gadget: uvc: Missing files for configfs interface" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
usb: gadget: uvc: Missing files for configfs interface
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-gadget-uvc-missing-files-for-configfs-interface.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
c8cd751060b149997b9de53a494fb1490ded72c5Mon Sep 17 00:00:00 2001
From: Petr Cvek <[email protected]>
Date: Tue, 7 Mar 2017 00:57:20 +0100
Subject: usb: gadget: uvc: Missing files for configfs interface
From: Petr Cvek <[email protected]>
commit c8cd751060b149997b9de53a494fb1490ded72c5 upstream.
Commit 76e0da34c7ce ("usb-gadget/uvc: use per-attribute show and store methods") caused a stringification of an undefined macro argument "aname", so three UVC parameters (streaming_interval, streaming_maxpacket and streaming_maxburst) were named "aname".
Add the definition of "aname" to the main macro and name the filenames as originaly intended.
--- drivers/usb/gadget/function/uvc_configfs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/usb/gadget/function/uvc_configfs.c +8 -8
@@ -2202,7 +2202,7 @@ static struct configfs_item_operations u .release = uvc_attr_release, }; -#define UVCG_OPTS_ATTR (cname, conv, str2u, uxx, vnoc, limit) \ +#define UVCG_OPTS_ATTR (cname, aname, conv, str2u, uxx, vnoc, limit) \ static ssize_t f_uvc_opts_##cname##_show( \ struct config_item *item, char *page) \ { \
@@ -2245,16 +2245,16 @@ end: \return ret; \ } \ \ -UVC_ATTR(f_uvc_opts_, cname, aname) +UVC_ATTR(f_uvc_opts_, cname, cname)#define identity_conv (x) (x) -UVCG_OPTS_ATTR (streaming_interval, identity_conv, kstrtou8, u8, identity_conv, -16 ); -UVCG_OPTS_ATTR (streaming_maxpacket, le16_to_cpu, kstrtou16, u16, le16_to_cpu, -3072 ); -UVCG_OPTS_ATTR (streaming_maxburst, identity_conv, kstrtou8, u8, identity_conv, -15 ); +UVCG_OPTS_ATTR (streaming_interval, streaming_interval, identity_conv, + kstrtou8, u8, identity_conv,16 ); +UVCG_OPTS_ATTR (streaming_maxpacket, streaming_maxpacket, le16_to_cpu, + kstrtou16, u16, le16_to_cpu,3072 ); +UVCG_OPTS_ATTR (streaming_maxburst, streaming_maxburst, identity_conv, + kstrtou8, u8, identity_conv,15 );#undef identity_conv
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/usb-gadget-uvc-missing-files-for-configfs-interface.patch