From c95a8ef93fd70d9f5ae62154919a34f51cb2c66a Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 7 Aug 2008 13:04:51 -0400 Subject: [PATCH] --- yaml --- r: 108448 b: refs/heads/master c: 9ff78433f0aeb1f731a22a90206b685df4eaf52e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5a023338d166..64c54ee9bb44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d28525f8866244a77b677c0470d4859cb2b6c2a8 +refs/heads/master: 9ff78433f0aeb1f731a22a90206b685df4eaf52e diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index 6618bc89eb69..2be37fe466f2 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -774,8 +774,6 @@ void usb_deregister(struct usb_driver *driver) } EXPORT_SYMBOL_GPL(usb_deregister); -#ifdef CONFIG_PM - /* 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. @@ -822,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