summaryrefslogtreecommitdiff
path: root/Documentation/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-19 00:03:46 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-19 00:03:46 +0200
commitb4269e2799993fce54f5003a3597e6fa8b621993 (patch)
tree869349742d36518fef6f7eb73f03c968d582130c /Documentation/power
parentbfaa07bc322085582bdc40babb9d0cce17b57380 (diff)
parent8d2c794108aed16602de1fcc37e485e9243ab5c0 (diff)
Merge branch 'pm-doc'
* pm-doc: PM / Documentation: fix typos in power management description
Diffstat (limited to 'Documentation/power')
-rw-r--r--Documentation/power/devices.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/power/devices.txt b/Documentation/power/devices.txt
index 872815cd41d3..504dfe4d52eb 100644
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
@@ -583,9 +583,10 @@ for the given device during all power transitions, instead of the respective
subsystem-level callbacks. Specifically, if a device's pm_domain pointer is
not NULL, the ->suspend() callback from the object pointed to by it will be
executed instead of its subsystem's (e.g. bus type's) ->suspend() callback and
-anlogously for all of the remaining callbacks. In other words, power management
-domain callbacks, if defined for the given device, always take precedence over
-the callbacks provided by the device's subsystem (e.g. bus type).
+analogously for all of the remaining callbacks. In other words, power
+management domain callbacks, if defined for the given device, always take
+precedence over the callbacks provided by the device's subsystem (e.g. bus
+type).
The support for device power management domains is only relevant to platforms
needing to use the same device driver power management callbacks in many
@@ -598,7 +599,7 @@ it into account in any way.
Device Low Power (suspend) States
---------------------------------
Device low-power states aren't standard. One device might only handle
-"on" and "off, while another might support a dozen different versions of
+"on" and "off", while another might support a dozen different versions of
"on" (how many engines are active?), plus a state that gets back to "on"
faster than from a full "off".