History

Merge tag 'usb-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY updates from Greg KH: "Here is the big USB and PHY driver update for 4.16-rc1. Along with the normally expected XHCI, MUSB, and Gadget driver patches, there are some PHY driver fixes, license cleanups, sysfs attribute cleanups, usbip changes, and a raft of other smaller fixes and additions. Full details are in the shortlog. All of these have been in the linux-next tree for a long time with no reported issues" * tag 'usb-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (137 commits) USB: serial: pl2303: new device id for Chilitag USB: misc: fix up some remaining DEVICE_ATTR() usages USB: musb: fix up one odd DEVICE_ATTR() usage USB: atm: fix up some remaining DEVICE_ATTR() usage USB: move many drivers to use DEVICE_ATTR_WO USB: move many drivers to use DEVICE_ATTR_RO USB: move many drivers to use DEVICE_ATTR_RW USB: misc: chaoskey: Use true and false for boolean values USB: storage: remove old wording about how to submit a change USB: storage: remove invalid URL from drivers usb: ehci-omap: don't complain on -EPROBE_DEFER when no PHY found usbip: list: don't list devices attached to vhci_hcd usbip: prevent bind loops on devices attached to vhci_hcd USB: serial: remove redundant initializations of 'mos_parport' usb/gadget: Fix "high bandwidth" check in usb_gadget_ep_match_desc() usb: gadget: compress return logic into one line usbip: vhci_hcd: update 'status' file header and format USB: serial: simple: add Motorola Tetra driver CDC-ACM: apply quirk for card reader usb: option: Add support for FS040U modem ...

Linus Torvalds committed 8 years ago

Commit e4ee8b82 parents 7109a04 d08dd3f160 files · +3875 −1454Browse files

Showing the changes to include/uapi/linux (2 of 160 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/usb/ch9.h +2 −2
  2. include/uapi/linux/usbdevice_fs.h +1 −1
include/uapi/linux/usb/ch9.h+2−2
@@ -1077,9 +1077,9 @@ struct usb_ptm_cap_descriptor { · 1076 unmodified lines
1077#define USB_DT_USB_PTM_ID_SIZE 31077#define USB_DT_USB_PTM_ID_SIZE 3
1078/*1078/*
1079 * The size of the descriptor for the Sublink Speed Attribute Count1079 * The size of the descriptor for the Sublink Speed Attribute Count
1080 * (SSAC) specified in bmAttributes[4:0].1080 * (SSAC) specified in bmAttributes[4:0]. SSAC is zero-based
1081 */1081 */
1082#define USB_DT_USB_SSP_CAP_SIZE(ssac) (16 + ssac * 4)1082#define USB_DT_USB_SSP_CAP_SIZE(ssac) (12 + (ssac + 1) * 4)
1083 1083
1084/*-------------------------------------------------------------------------*/1084/*-------------------------------------------------------------------------*/
1085 1085
include/uapi/linux/usbdevice_fs.h+1−1
@@ -79,7 +79,7 @@ struct usbdevfs_connectinfo { · 78 unmodified lines
79#define USBDEVFS_URB_SHORT_NOT_OK 0x0179#define USBDEVFS_URB_SHORT_NOT_OK 0x01
80#define USBDEVFS_URB_ISO_ASAP 0x0280#define USBDEVFS_URB_ISO_ASAP 0x02
81#define USBDEVFS_URB_BULK_CONTINUATION 0x0481#define USBDEVFS_URB_BULK_CONTINUATION 0x04
82#define USBDEVFS_URB_NO_FSBR 0x2082#define USBDEVFS_URB_NO_FSBR 0x20 /* Not used */
83#define USBDEVFS_URB_ZERO_PACKET 0x4083#define USBDEVFS_URB_ZERO_PACKET 0x40
84#define USBDEVFS_URB_NO_INTERRUPT 0x8084#define USBDEVFS_URB_NO_INTERRUPT 0x80
85 85