2010-04-07 12:15:28

by Mark Brown

Subject: [PATCH] mfd: Fix WM831x I2C suspend prototype

Sorry about the oversight.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/mfd/wm831x-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index d4331b2..1a968f3 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1767,7 +1767,7 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
return 0;
}

-static int wm831x_i2c_suspend(struct i2c_client *i2c)
+static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
{
struct wm831x *wm831x = i2c_get_clientdata(i2c);

--
1.7.0.3

2010-04-08 09:34:44

by Samuel Ortiz

Subject: Re: [PATCH] mfd: Fix WM831x I2C suspend prototype

On Wed, Apr 07, 2010 at 01:15:22PM +0100, Mark Brown wrote:
> Sorry about the oversight.
No problem. I wonder how that slipped through my compile tests...
Anyway, I merged it with your last wm831x-core patch.

Cheers,
Samuel.


> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/mfd/wm831x-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
> index d4331b2..1a968f3 100644
> --- a/drivers/mfd/wm831x-core.c
> +++ b/drivers/mfd/wm831x-core.c
> @@ -1767,7 +1767,7 @@ static int wm831x_i2c_remove(struct i2c_client *i2c)
> return 0;
> }
>
> -static int wm831x_i2c_suspend(struct i2c_client *i2c)
> +static int wm831x_i2c_suspend(struct i2c_client *i2c, pm_message_t mesg)
> {
> struct wm831x *wm831x = i2c_get_clientdata(i2c);
>
> --
> 1.7.0.3
>

--
Intel Open Source Technology Centre
http://oss.intel.com/