diff options
Diffstat (limited to 'drivers/usb/core/driver.c')
-rw-r--r-- | drivers/usb/core/driver.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index ddb54e14a5c5..2be37fe466f2 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
@@ -774,7 +774,6 @@ void usb_deregister(struct usb_driver *driver) | |||
774 | } | 774 | } |
775 | EXPORT_SYMBOL_GPL(usb_deregister); | 775 | EXPORT_SYMBOL_GPL(usb_deregister); |
776 | 776 | ||
777 | |||
778 | /* Forced unbinding of a USB interface driver, either because | 777 | /* Forced unbinding of a USB interface driver, either because |
779 | * it doesn't support pre_reset/post_reset/reset_resume or | 778 | * it doesn't support pre_reset/post_reset/reset_resume or |
780 | * because it doesn't support suspend/resume. | 779 | * because it doesn't support suspend/resume. |
@@ -821,6 +820,8 @@ void usb_rebind_intf(struct usb_interface *intf) | |||
821 | dev_warn(&intf->dev, "rebind failed: %d\n", rc); | 820 | dev_warn(&intf->dev, "rebind failed: %d\n", rc); |
822 | } | 821 | } |
823 | 822 | ||
823 | #ifdef CONFIG_PM | ||
824 | |||
824 | #define DO_UNBIND 0 | 825 | #define DO_UNBIND 0 |
825 | #define DO_REBIND 1 | 826 | #define DO_REBIND 1 |
826 | 827 | ||
@@ -872,8 +873,6 @@ static void do_unbind_rebind(struct usb_device *udev, int action) | |||
872 | } | 873 | } |
873 | } | 874 | } |
874 | 875 | ||
875 | #ifdef CONFIG_PM | ||
876 | |||
877 | /* Caller has locked udev's pm_mutex */ | 876 | /* Caller has locked udev's pm_mutex */ |
878 | static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) | 877 | static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) |
879 | { | 878 | { |