diff options
| author | Michal Nazarewicz <mina86@mina86.com> | 2014-06-06 11:12:52 +0200 |
|---|---|---|
| committer | Krzysztof Opasiak <k.opasiak@samsung.com> | 2014-06-11 15:16:47 +0200 |
| commit | 13d350d47280a83750eb5a76f1795db034930433 (patch) | |
| tree | 9c459e40c3e7020e812418625b4865a2fc1e4ac9 | |
| parent | c1c24b07f2e04123e8db588689949ee8f971047a (diff) | |
| download | linux-3.10-13d350d47280a83750eb5a76f1795db034930433.tar.gz linux-3.10-13d350d47280a83750eb5a76f1795db034930433.tar.bz2 linux-3.10-13d350d47280a83750eb5a76f1795db034930433.zip | |
usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
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>
Cc: <stable@vger.kernel.org> # 3.14
Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Commit taken from linux-usb mailing list. Not merged yet but
required to fix build of FFS apps.
Change-Id: I90fc3786f043aca9463e255ad9900c2d341fd17b
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index 2a4b4a72a4f..24b68c59dcf 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -33,6 +33,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)); /* * Descriptors format: |