Skip to content

Commit

Permalink
usb: gadget: f_fs: resurect usb_functionfs_descs_head structure
Browse files Browse the repository at this point in the history
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.

Cc: <[email protected]>  # 3.14
Reported-by: Lad, Prabhakar <[email protected]>
Reported-by: Krzysztof Opasiak <[email protected]>
Signed-off-by: Michal Nazarewicz <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
  • Loading branch information
mina86 authored and Felipe Balbi committed Jun 27, 2014
1 parent 9ad7860 commit 0912214
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions include/uapi/linux/usb/functionfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 0912214

Please sign in to comment.