diff options
| author | Daniel Vetter <[email protected]> | 2017-07-27 09:33:49 +0200 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2017-07-27 09:33:49 +0200 |
| commit | 64282ea2d2a90437c0739ce016b80a1dec16507e (patch) | |
| tree | f1d484bb588a0739fda81db193325cf0c0d553ea /include/uapi/linux/usb/functionfs.h | |
| parent | d2939424ff89f1ee3aeefdd030cba6ba163e77ac (diff) | |
| parent | e6742e1021a5cec55fab50a0b115c65217488eda (diff) | |
Merge airlied/drm-next into drm-intel-next-queued
Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'include/uapi/linux/usb/functionfs.h')
| -rw-r--r-- | include/uapi/linux/usb/functionfs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/usb/functionfs.h b/include/uapi/linux/usb/functionfs.h index 062606f02309..f913d08ab7bb 100644 --- a/include/uapi/linux/usb/functionfs.h +++ b/include/uapi/linux/usb/functionfs.h @@ -275,13 +275,14 @@ struct usb_functionfs_event { #define FUNCTIONFS_INTERFACE_REVMAP _IO('g', 128) /* - * Returns real bEndpointAddress of an endpoint. If function is not - * active returns -ENODEV. + * Returns real bEndpointAddress of an endpoint. If endpoint shuts down + * during the call, returns -ESHUTDOWN. */ #define FUNCTIONFS_ENDPOINT_REVMAP _IO('g', 129) /* - * Returns endpoint descriptor. If function is not active returns -ENODEV. + * Returns endpoint descriptor. If endpoint shuts down during the call, + * returns -ESHUTDOWN. */ #define FUNCTIONFS_ENDPOINT_DESC _IOR('g', 130, \ struct usb_endpoint_descriptor) |