diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-26 21:49:57 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2003-02-26 21:49:57 -0800 |
| commit | fffd915522cb703e95381fc52c0ac3843f013f18 (patch) | |
| tree | 7efd17b1bd1a584a7fa10633d26b4b5e99283deb /kernel/pm.c | |
| parent | a6cc5237a1f189c30cd06d05e2955e5bc63d8913 (diff) | |
| parent | be8013e867207d570f33cc1c66bd06797f1eed6b (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.5
into kroah.com:/home/greg/linux/BK/pci-2.5
Diffstat (limited to 'kernel/pm.c')
| -rw-r--r-- | kernel/pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/pm.c b/kernel/pm.c index a710764606ba..afffd046c2f6 100644 --- a/kernel/pm.c +++ b/kernel/pm.c @@ -141,11 +141,11 @@ void pm_unregister_all(pm_callback callback) * data field must hold the intended next state. No call is made * if the state matches. * - * BUGS: what stops two power management requests occuring in parallel + * BUGS: what stops two power management requests occurring in parallel * and conflicting. * * WARNING: Calling pm_send directly is not generally recommended, in - * paticular there is no locking against the pm_dev going away. The + * particular there is no locking against the pm_dev going away. The * caller must maintain all needed locking or have 'inside knowledge' * on the safety. Also remember that this function is not locked against * pm_unregister. This means that you must handle SMP races on callback @@ -227,7 +227,7 @@ static void pm_undo_all(struct pm_dev *last) * Zero is returned on success. If a suspend fails then the status * from the device that vetoes the suspend is returned. * - * BUGS: what stops two power management requests occuring in parallel + * BUGS: what stops two power management requests occurring in parallel * and conflicting. */ |