diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 23:09:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-22 23:09:42 -0700 |
| commit | 5fa21d821f6972e70942f2c555ec29dde962bdb2 (patch) | |
| tree | fbe0a083ce7fc7ddb58cd452d5598662acac325b /drivers/usb | |
| parent | 8542e5893c2b10b4f6c80149e7dc3fdd2dc38bc6 (diff) | |
| parent | 5d9fd169c9fbdaecdc430431e59bf94ff40b93d3 (diff) | |
| download | linux-5fa21d821f6972e70942f2c555ec29dde962bdb2.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
[PATCH] Driver core: fix locking issues with the devices that are attached to classes
[PATCH] USB: get USB suspend to work again
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/core/usb.c | 2 |
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; } |