diff options
Diffstat (limited to 'include/linux/usb.h')
-rw-r--r-- | include/linux/usb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 0873c6219efc..bde8c65e2bfc 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
@@ -839,6 +839,8 @@ struct usbdrv_wrap { | |||
839 | * do (or don't) show up otherwise in the filesystem. | 839 | * do (or don't) show up otherwise in the filesystem. |
840 | * @suspend: Called when the device is going to be suspended by the system. | 840 | * @suspend: Called when the device is going to be suspended by the system. |
841 | * @resume: Called when the device is being resumed by the system. | 841 | * @resume: Called when the device is being resumed by the system. |
842 | * @reset_resume: Called when the suspended device has been reset instead | ||
843 | * of being resumed. | ||
842 | * @pre_reset: Called by usb_reset_composite_device() when the device | 844 | * @pre_reset: Called by usb_reset_composite_device() when the device |
843 | * is about to be reset. | 845 | * is about to be reset. |
844 | * @post_reset: Called by usb_reset_composite_device() after the device | 846 | * @post_reset: Called by usb_reset_composite_device() after the device |
@@ -885,9 +887,10 @@ struct usb_driver { | |||
885 | 887 | ||
886 | int (*suspend) (struct usb_interface *intf, pm_message_t message); | 888 | int (*suspend) (struct usb_interface *intf, pm_message_t message); |
887 | int (*resume) (struct usb_interface *intf); | 889 | int (*resume) (struct usb_interface *intf); |
890 | int (*reset_resume)(struct usb_interface *intf); | ||
888 | 891 | ||
889 | void (*pre_reset) (struct usb_interface *intf); | 892 | int (*pre_reset)(struct usb_interface *intf); |
890 | void (*post_reset) (struct usb_interface *intf, int reset_resume); | 893 | int (*post_reset)(struct usb_interface *intf); |
891 | 894 | ||
892 | const struct usb_device_id *id_table; | 895 | const struct usb_device_id *id_table; |
893 | 896 | ||