diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 13:57:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 13:57:32 +0200 |
| commit | 975439fe73d1f0f7ce8c235c66783bd34dc459c3 (patch) | |
| tree | 84e29852d96283b13c6e603f86bd506a631343c5 /drivers/usb/core/driver.c | |
| parent | ef31023743e66de7184e9aad432291c842a6384b (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
Merge branch 'x86/amd-iommu' into x86/urgent
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) } EXPORT_SYMBOL_GPL(usb_deregister); - /* Forced unbinding of a USB interface driver, either because * it doesn't support pre_reset/post_reset/reset_resume or * because it doesn't support suspend/resume. @@ -821,6 +820,8 @@ void usb_rebind_intf(struct usb_interface *intf) dev_warn(&intf->dev, "rebind failed: %d\n", rc); } +#ifdef CONFIG_PM + #define DO_UNBIND 0 #define DO_REBIND 1 @@ -872,8 +873,6 @@ static void do_unbind_rebind(struct usb_device *udev, int action) } } -#ifdef CONFIG_PM - /* Caller has locked udev's pm_mutex */ static int usb_suspend_device(struct usb_device *udev, pm_message_t msg) { |