diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 19:03:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 19:03:09 -0500 |
| commit | bb0851ff9dc65dd9c9365fdb87895d98235ac463 (patch) | |
| tree | d19b7440bb5b0dec31cef2c384cccdd473f314e7 /Documentation | |
| parent | 34f2c1c35ff014a5d145971e41caa940cd62d563 (diff) | |
| parent | 5f629ad7e5f9b99c6d025bf199d402734bd72d0f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (25 commits)
USB: s3c2410 gadget: ensure vbus pin in input mode during read
USB: s3c2410 gadget: allow sharing of vbus irq
USB: s3c2410 gadget: Header move fixups
USB: usb-storage: unusual_devs entry for JetFlash TS1GJF2A
USB: fix up EHCI startup synchronization
USB: make the microtek driver and HAL cooperate
USB: uevent environment key fix
USB: keep track of whether interface sysfs files exist
USB: sierra: new product id
USB HCD: avoid duplicate local_irq_disable()
USB: mailing lists have changed
USB: remove USB HUB entry from MAINTAINERS
USB: fix directory references in usb/README
USB: add support for an older firmware revision for the Nikon D200
USB: FIx locks and urb->status in adutux (updated)
USB: power-management documenation update
USB: Fix signr comment in usbdevice_fs.h
usbserial: fix inconsistent lock state
USB: fix usbled disconnect read race #2
USB: free memory when writing fails in usb/serial/mos7840.c
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/usb/power-management.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/usb/power-management.txt b/Documentation/usb/power-management.txt index 97842deec471..b2fc4d4a9917 100644 --- a/Documentation/usb/power-management.txt +++ b/Documentation/usb/power-management.txt | |||
| @@ -278,6 +278,14 @@ optional. The methods' jobs are quite simple: | |||
| 278 | (although the interfaces will be in the same altsettings as | 278 | (although the interfaces will be in the same altsettings as |
| 279 | before the suspend). | 279 | before the suspend). |
| 280 | 280 | ||
| 281 | If the device is disconnected or powered down while it is suspended, | ||
| 282 | the disconnect method will be called instead of the resume or | ||
| 283 | reset_resume method. This is also quite likely to happen when | ||
| 284 | waking up from hibernation, as many systems do not maintain suspend | ||
| 285 | current to the USB host controllers during hibernation. (It's | ||
| 286 | possible to work around the hibernation-forces-disconnect problem by | ||
| 287 | using the USB Persist facility.) | ||
| 288 | |||
| 281 | The reset_resume method is used by the USB Persist facility (see | 289 | The reset_resume method is used by the USB Persist facility (see |
| 282 | Documentation/usb/persist.txt) and it can also be used under certain | 290 | Documentation/usb/persist.txt) and it can also be used under certain |
| 283 | circumstances when CONFIG_USB_PERSIST is not enabled. Currently, if a | 291 | circumstances when CONFIG_USB_PERSIST is not enabled. Currently, if a |