diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /drivers/ieee1394/nodemgr.c | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
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 | ||