All of lore.kernel.org
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mfd: Fix WM831x I2C suspend prototype
Date: Thu, 8 Apr 2010 11:35:17 +0200	[thread overview]
Message-ID: <20100408093516.GC3075@sortiz.org> (raw)
In-Reply-To: <1270642522-17468-1-git-send-email-broonie@opensource.wolfsonmicro.com>

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 <broonie@opensource.wolfsonmicro.com>
> ---
>  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/

      reply	other threads:[~2010-04-08  9:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-07 12:15 [PATCH] mfd: Fix WM831x I2C suspend prototype Mark Brown
2010-04-08  9:35 ` Samuel Ortiz [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100408093516.GC3075@sortiz.org \
    --to=sameo@linux.intel.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.