LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] mfd: da903x: fix event masking for da9030
@ 2008-11-06 11:23 Mike Rapoport
  2008-11-07 12:58 ` Eric Miao
  2008-11-08  0:31 ` Samuel Ortiz
  0 siblings, 2 replies; 3+ messages in thread
From: Mike Rapoport @ 2008-11-06 11:23 UTC (permalink / raw)
  To: sameo; +Cc: linux-kernel, eric.y.miao, Mike Rapoport


Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
 drivers/mfd/da903x.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
index b57326a..0b5bd85 100644
--- a/drivers/mfd/da903x.c
+++ b/drivers/mfd/da903x.c
@@ -267,7 +267,7 @@ static int da9030_mask_events(struct da903x_chip *chip, unsigned int events)
 {
 	uint8_t v[3];
 
-	chip->events_mask &= ~events;
+	chip->events_mask |= events;
 
 	v[0] = (chip->events_mask & 0xff);
 	v[1] = (chip->events_mask >> 8) & 0xff;
-- 
1.5.6.4


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: da903x: fix event masking for da9030
  2008-11-06 11:23 [PATCH] mfd: da903x: fix event masking for da9030 Mike Rapoport
@ 2008-11-07 12:58 ` Eric Miao
  2008-11-08  0:31 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Miao @ 2008-11-07 12:58 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: sameo, linux-kernel

On Thu, Nov 6, 2008 at 7:23 PM, Mike Rapoport <mike@compulab.co.il> wrote:
>
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>

Acked-by: Eric Miao <eric.miao@marvell.com>

> ---
>  drivers/mfd/da903x.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index b57326a..0b5bd85 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -267,7 +267,7 @@ static int da9030_mask_events(struct da903x_chip *chip, unsigned int events)
>  {
>        uint8_t v[3];
>
> -       chip->events_mask &= ~events;
> +       chip->events_mask |= events;
>
>        v[0] = (chip->events_mask & 0xff);
>        v[1] = (chip->events_mask >> 8) & 0xff;
> --
> 1.5.6.4
>
>



-- 
Cheers
- eric

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] mfd: da903x: fix event masking for da9030
  2008-11-06 11:23 [PATCH] mfd: da903x: fix event masking for da9030 Mike Rapoport
  2008-11-07 12:58 ` Eric Miao
@ 2008-11-08  0:31 ` Samuel Ortiz
  1 sibling, 0 replies; 3+ messages in thread
From: Samuel Ortiz @ 2008-11-08  0:31 UTC (permalink / raw)
  To: Mike Rapoport; +Cc: linux-kernel, eric.y.miao

On Thu, Nov 06, 2008 at 01:23:51PM +0200, Mike Rapoport wrote:
> 
> Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Thanks Mike, applied to my for-linus branch.

Cheers,
Samuel.

> ---
>  drivers/mfd/da903x.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index b57326a..0b5bd85 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -267,7 +267,7 @@ static int da9030_mask_events(struct da903x_chip *chip, unsigned int events)
>  {
>  	uint8_t v[3];
>  
> -	chip->events_mask &= ~events;
> +	chip->events_mask |= events;
>  
>  	v[0] = (chip->events_mask & 0xff);
>  	v[1] = (chip->events_mask >> 8) & 0xff;
> -- 
> 1.5.6.4
> 

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-11-08  0:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-06 11:23 [PATCH] mfd: da903x: fix event masking for da9030 Mike Rapoport
2008-11-07 12:58 ` Eric Miao
2008-11-08  0:31 ` Samuel Ortiz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).