Messages in this thread | | | Date | Fri, 1 May 2020 16:15:30 +0200 | From | Michał Mirosław <> | Subject | Re: [PATCH] power: charger-manager: fix adding of optional properties |
| |
On Fri, May 01, 2020 at 03:51:09PM +0200, Sebastian Reichel wrote: > Hi, > > On Fri, May 01, 2020 at 03:39:53PM +0200, Michał Mirosław wrote: > > Use num_properties to index added property. > > This will prevent overwriting POWER_SUPPLY_PROP_CHARGE_NOW with > > POWER_SUPPLY_PROP_CURRENT_NOW and leaving the latter entry > > uninitialized. > > > > For clarity, num_properties is initialized with length of the copied > > array instead of relying on previously memcpy'd value. > > > > Fixes: 0a46510addc7 ("power: supply: charger-manager: Prepare for const properties") > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > > --- > > I folded your fix directly into the charger-manager patch, which did > not yet reach linux-next. If you send the num_properties part as a > separate one, I will merge it.
Since your patch already changes the line, maybe you could squash first hunk below into it?
> > drivers/power/supply/charger-manager.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c > > index a71e2ee81423..2ef53dc1f2fb 100644 > > --- a/drivers/power/supply/charger-manager.c > > +++ b/drivers/power/supply/charger-manager.c > > @@ -1729,7 +1729,7 @@ static int charger_manager_probe(struct platform_device *pdev) > > memcpy(properties, default_charger_props, > > sizeof(enum power_supply_property) * > > ARRAY_SIZE(default_charger_props)); > > - num_properties = psy_default.num_properties; > > + num_properties = ARRAY_SIZE(default_charger_props); > > > > /* Find which optional psy-properties are available */ > > fuel_gauge = power_supply_get_by_name(desc->psy_fuel_gauge); [...]
| |