diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/ieee1394/nodemgr.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/ieee1394/nodemgr.c')
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 347ece6b583c..7fff5a1d2ea4 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
| @@ -1292,7 +1292,7 @@ static void nodemgr_suspend_ne(struct node_entry *ne) | |||
| 1292 | 1292 | ||
| 1293 | if (ud->device.driver && | 1293 | if (ud->device.driver && |
| 1294 | (!ud->device.driver->suspend || | 1294 | (!ud->device.driver->suspend || |
| 1295 | ud->device.driver->suspend(&ud->device, PMSG_SUSPEND, 0))) | 1295 | ud->device.driver->suspend(&ud->device, PMSG_SUSPEND))) |
| 1296 | device_release_driver(&ud->device); | 1296 | device_release_driver(&ud->device); |
| 1297 | } | 1297 | } |
| 1298 | up_write(&ne->device.bus->subsys.rwsem); | 1298 | up_write(&ne->device.bus->subsys.rwsem); |
| @@ -1315,7 +1315,7 @@ static void nodemgr_resume_ne(struct node_entry *ne) | |||
| 1315 | continue; | 1315 | continue; |
| 1316 | 1316 | ||
| 1317 | if (ud->device.driver && ud->device.driver->resume) | 1317 | if (ud->device.driver && ud->device.driver->resume) |
| 1318 | ud->device.driver->resume(&ud->device, 0); | 1318 | ud->device.driver->resume(&ud->device); |
| 1319 | } | 1319 | } |
| 1320 | up_read(&ne->device.bus->subsys.rwsem); | 1320 | up_read(&ne->device.bus->subsys.rwsem); |
| 1321 | 1321 | ||