2008-11-06 11:24:11

by Mike Rapoport

Subject: [PATCH] mfd: da903x: fix event masking for da9030

Signed-off-by: Mike Rapoport <[email protected]>
---
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

2008-11-07 13:04:18

by Eric Miao

Subject: Re: [PATCH] mfd: da903x: fix event masking for da9030

On Thu, Nov 6, 2008 at 7:23 PM, Mike Rapoport <[email protected]> wrote:
>
> Signed-off-by: Mike Rapoport <[email protected]>

Acked-by: Eric Miao <[email protected]>

> ---
> 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

2008-11-08 00:28:57

by Samuel Ortiz

Subject: Re: [PATCH] mfd: da903x: fix event masking for da9030

On Thu, Nov 06, 2008 at 01:23:51PM +0200, Mike Rapoport wrote:
>
> Signed-off-by: Mike Rapoport <[email protected]>
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/