| From 09122141785348bf9539762a5f5dbbae3761c783 Mon Sep 17 00:00:00 2001 |
| From: Michal Nazarewicz <mina86@mina86.com> |
| Date: Fri, 13 Jun 2014 15:38:04 +0200 |
| Subject: usb: gadget: f_fs: resurect usb_functionfs_descs_head structure |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Michal Nazarewicz <mina86@mina86.com> |
| |
| commit 09122141785348bf9539762a5f5dbbae3761c783 upstream. |
| |
| Even though usb_functionfs_descs_head structure is now deprecated, |
| it has been used by some user space tools. Its removel in commit |
| [ac8dde1: “Add flags to descriptors block”] was an oversight |
| leading to build breakage for such tools. |
| |
| Bring it back so that old user space tools can still be build |
| without problems on newer kernel versions. |
| |
| Reported-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> |
| Reported-by: Krzysztof Opasiak <k.opasiak@samsung.com> |
| Signed-off-by: Michal Nazarewicz <mina86@mina86.com> |
| Signed-off-by: Felipe Balbi <balbi@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| include/uapi/linux/usb/functionfs.h | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/include/uapi/linux/usb/functionfs.h |
| +++ b/include/uapi/linux/usb/functionfs.h |
| @@ -27,6 +27,13 @@ struct usb_endpoint_descriptor_no_audio |
| __u8 bInterval; |
| } __attribute__((packed)); |
| |
| +/* Legacy format, deprecated as of 3.14. */ |
| +struct usb_functionfs_descs_head { |
| + __le32 magic; |
| + __le32 length; |
| + __le32 fs_count; |
| + __le32 hs_count; |
| +} __attribute__((packed, deprecated)); |
| |
| /* |
| * All numbers must be in little endian order. |
