diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 17:27:29 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-08-21 17:27:29 +0200 |
| commit | e9dc122166b8d863d3057a66ada04838e5548e52 (patch) | |
| tree | 749e15bf719b64bf9113db7acd8e043d9742cb26 /drivers/base/power | |
| parent | sunrpc: fix memory leak in unix_gid cache. (diff) | |
| parent | SUNRPC: Ensure that sunrpc gets initialised before nfs, lockd, etc... (diff) | |
| download | linux-e9dc122166b8d863d3057a66ada04838e5548e52.tar.xz linux-e9dc122166b8d863d3057a66ada04838e5548e52.zip | |
Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming
Conflicts:
net/sunrpc/cache.c
Diffstat (limited to 'drivers/base/power')
| -rw-r--r-- | drivers/base/power/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index fae725458981..58a3e572f2c9 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -762,6 +762,7 @@ static int dpm_prepare(pm_message_t state) dev->power.status = DPM_ON; if (error == -EAGAIN) { put_device(dev); + error = 0; continue; } printk(KERN_ERR "PM: Failed to prepare device %s " |