diff options
| author | Eugene Surovegin <ebs@ebshome.net> | 2005-09-07 00:16:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 01:57:15 +0200 |
| commit | 842363ff5fd79ce75c311175ea832901e2b2d40e (patch) | |
| tree | 43ccbcd38dfb67148a633ec1c881c4af88422e5b /arch | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6 (diff) | |
| download | linux-842363ff5fd79ce75c311175ea832901e2b2d40e.tar.xz linux-842363ff5fd79ce75c311175ea832901e2b2d40e.zip | |
[PATCH] ppc32: fix ocp_device_suspend to use pm_message_t instead of u32
Recent "u32 -> pm_message_t" change triggered hidden bug in
ocp_device_suspend. Fix it to correctly use pm_message_t instead of u32.
Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc/syslib/ocp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index e5fd2ae503ea..9ccce438bd7a 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c @@ -165,7 +165,7 @@ ocp_device_remove(struct device *dev) } static int -ocp_device_suspend(struct device *dev, u32 state) +ocp_device_suspend(struct device *dev, pm_message_t state) { struct ocp_device *ocp_dev = to_ocp_dev(dev); struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver); |