aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-22 13:29:52 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-22 22:54:23 -0700
commit0517587e5896cef1d5f99d3b24f5f2ca15d952ad (patch)
tree8f96898bc231018e899ae92c5e2542fe13a7e9d8 /drivers
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff)
downloadlinux-dev-0517587e5896cef1d5f99d3b24f5f2ca15d952ad.tar.xz
linux-dev-0517587e5896cef1d5f99d3b24f5f2ca15d952ad.zip
[PATCH] USB: get USB suspend to work again
Yeah, it's a hack, but it is only temporary until Alan's patches reworking this area make it in. We really should not care what devices below us are doing, especially when we do not really know what type of devices they are. This patch relies on the fact that the endpoint devices do not have a driver assigned to us. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/usb.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 515310751303..fb488c8a860c 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -991,6 +991,8 @@ void usb_buffer_unmap_sg (struct usb_device *dev, unsigned pipe,
static int verify_suspended(struct device *dev, void *unused)
{
+ if (dev->driver == NULL)
+ return 0;
return (dev->power.power_state.event == PM_EVENT_ON) ? -EBUSY : 0;
}