2010-06-15 00:45:08

by Ryan Mallon

Subject: [PATCH] ds2782: Fix ds2782_get_capacity return value

The ds2782_get_capacity function should return 0 on success, not the
capacity value.

Signed-off-by: Ryan Mallon <[email protected]>
---
drivers/power/ds2782_battery.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
index d762a0c..2afbeec 100644
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info *info, int *capacity)
if (err)
return err;
*capacity = raw;
- return raw;
+ return 0;
}

static int ds2786_get_current(struct ds278x_info *info, int *current_uA)
--
1.5.5.1

2010-06-20 21:35:15

by Ryan Mallon

Subject: Re: [PATCH] ds2782: Fix ds2782_get_capacity return value

On 06/15/2010 12:44 PM, Ryan Mallon wrote:
> The ds2782_get_capacity function should return 0 on success, not the
> capacity value.
>
> Signed-off-by: Ryan Mallon <[email protected]>
> ---
> drivers/power/ds2782_battery.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
> index d762a0c..2afbeec 100644
> --- a/drivers/power/ds2782_battery.c
> +++ b/drivers/power/ds2782_battery.c
> @@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info *info, int *capacity)
> if (err)
> return err;
> *capacity = raw;
> - return raw;
> + return 0;
> }
>
> static int ds2786_get_current(struct ds278x_info *info, int *current_uA)

Ping, Anton?

~Ryan

--
Bluewater Systems Ltd - ARM Technology Solution Centre

Ryan Mallon 5 Amuri Park, 404 Barbadoes St
[email protected] PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934

2010-06-21 15:15:50

by Anton Vorontsov

Subject: Re: [PATCH] ds2782: Fix ds2782_get_capacity return value

On Mon, Jun 21, 2010 at 09:35:09AM +1200, Ryan Mallon wrote:
> On 06/15/2010 12:44 PM, Ryan Mallon wrote:
> > The ds2782_get_capacity function should return 0 on success, not the
> > capacity value.
> >
> > Signed-off-by: Ryan Mallon <[email protected]>
> > ---
> > drivers/power/ds2782_battery.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
> > index d762a0c..2afbeec 100644
> > --- a/drivers/power/ds2782_battery.c
> > +++ b/drivers/power/ds2782_battery.c
> > @@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info *info, int *capacity)
> > if (err)
> > return err;
> > *capacity = raw;
> > - return raw;
> > + return 0;
> > }
> >
> > static int ds2786_get_current(struct ds278x_info *info, int *current_uA)
>
> Ping, Anton?

Applied to battery-2.6.35.git, thanks!

2010-06-22 09:03:22

by CoffBeta

Subject: Re: [PATCH] ds2782: Fix ds2782_get_capacity return value

confirm

On Mon, Jun 21, 2010 at 05:35, Ryan Mallon <[email protected]> wrote:
> On 06/15/2010 12:44 PM, Ryan Mallon wrote:
>> The ds2782_get_capacity function should return 0 on success, not the
>> capacity value.
>>
>> Signed-off-by: Ryan Mallon <[email protected]>
>> ---
>> ?drivers/power/ds2782_battery.c | ? ?2 +-
>> ?1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c
>> index d762a0c..2afbeec 100644
>> --- a/drivers/power/ds2782_battery.c
>> +++ b/drivers/power/ds2782_battery.c
>> @@ -163,7 +163,7 @@ static int ds2782_get_capacity(struct ds278x_info *info, int *capacity)
>> ? ? ? if (err)
>> ? ? ? ? ? ? ? return err;
>> ? ? ? *capacity = raw;
>> - ? ? return raw;
>> + ? ? return 0;
>> ?}
>>
>> ?static int ds2786_get_current(struct ds278x_info *info, int *current_uA)
>
> Ping, Anton?
>
> ~Ryan
>
> --
> Bluewater Systems Ltd - ARM Technology Solution Centre
>
> Ryan Mallon ? ? ? ? ? ? ? ? ? ? 5 Amuri Park, 404 Barbadoes St
> [email protected] ? ? ? ? ? PO Box 13 889, Christchurch 8013
> http://www.bluewatersys.com ? ? New Zealand
> Phone: +64 3 3779127 ? ? ? ? ? ?Freecall: Australia 1800 148 751
> Fax: ? +64 3 3779135 ? ? ? ? ? ? ? ? ? ? ?USA 1800 261 2934
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at ?http://www.tux.org/lkml/
>