diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 18:56:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:15 -0400 |
commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /drivers/media/video/msp3400.c | |
parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) |
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
Fix remaining bits of u32 vs. pm_message confusion. Should not break
anything.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/msp3400.c')
-rw-r--r-- | drivers/media/video/msp3400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index 62f1b8ddb98b..e956234abf24 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c | |||
@@ -1416,7 +1416,7 @@ static int msp_detach(struct i2c_client *client); | |||
1416 | static int msp_probe(struct i2c_adapter *adap); | 1416 | static int msp_probe(struct i2c_adapter *adap); |
1417 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); | 1417 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); |
1418 | 1418 | ||
1419 | static int msp_suspend(struct device * dev, u32 state, u32 level); | 1419 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level); |
1420 | static int msp_resume(struct device * dev, u32 level); | 1420 | static int msp_resume(struct device * dev, u32 level); |
1421 | 1421 | ||
1422 | static void msp_wake_thread(struct i2c_client *client); | 1422 | static void msp_wake_thread(struct i2c_client *client); |
@@ -1817,7 +1817,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
1817 | return 0; | 1817 | return 0; |
1818 | } | 1818 | } |
1819 | 1819 | ||
1820 | static int msp_suspend(struct device * dev, u32 state, u32 level) | 1820 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level) |
1821 | { | 1821 | { |
1822 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); | 1822 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); |
1823 | 1823 | ||