Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46cecd13 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel
Browse files

power: supply: Fix power_supply_am_i_supplied to return -ENODEV when apropriate 



Commit 2848e039 ("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: 2848e039 ("power: supply: Make power_supply_am_i_supplied ...")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 16ac345b

drivers/power/supply/power_supply_core.c

+3 −2
Original line number Diff line number Diff line
@@ -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;



	if (__power_supply_is_supplied_by(epsy, data->psy)) {

		data->count++;

	if (__power_supply_is_supplied_by(epsy, data->psy))

		if (!epsy->desc->get_property(epsy, POWER_SUPPLY_PROP_ONLINE,

					&ret))

			return ret.intval;

	}



	return 0;

}