lkml.org 
[lkml]   [2017]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 11/18] power: supply: Fix power_supply_am_i_supplied to return -ENODEV when apropriate
From
Date
On 08/06/2017 05:35 AM, Hans de Goede wrote:
> Commit 2848e039c562 ("power: supply: Make power_supply_am_i_supplied return
> -ENODEV if there are no suppliers") was supposed to make
> power_supply_am_i_supplied() return -ENODEV when there are no supplies
> which supply the supply passed to it.
>
> But instead it will only return -ENODEV when there are no supplies at
> all as data->count++; is incremented on every call of the iterator, rather
> then only when __power_supply_is_supplied_by returns true. This commit
> fixes this.
>
> Fixes: 2848e039c562 ("power: supply: Make power_supply_am_i_supplied ...")
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Independent of this series ?

> ---
> drivers/power/supply/power_supply_core.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 540d3e0aa011..0741fcef3b44 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -314,11 +314,12 @@ static int __power_supply_am_i_supplied(struct device *dev, void *_data)
> struct power_supply *epsy = dev_get_drvdata(dev);
> struct psy_am_i_supplied_data *data = _data;
>
> - data->count++;
> - if (__power_supply_is_supplied_by(epsy, data->psy))
> + if (__power_supply_is_supplied_by(epsy, data->psy)) {
> + data->count++;
> if (!epsy->desc->get_property(epsy, POWER_SUPPLY_PROP_ONLINE,
> &ret))
> return ret.intval;
> + }
>
> return 0;
> }
>

\
 
 \ /
  Last update: 2017-08-06 16:31    [W:0.410 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site