hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

power: generic-adc-battery: check for duplicate properties copied from iio channels 

If an iio channel defines a basic property, there are duplicate entries
in /sys/class/power/*/uevent.

So add a check to avoid duplicates. Since all channels may be duplicates,
we have to modify the related error check.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: stable@vger.kernel.org
Fixes: e60fea794e ("power: battery: Generic battery driver using IIO")
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
This commit is contained in:
H. Nikolaus Schaller 2018-06-26 15:28:30 +02:00 committed by Sebastian Reichel
parent 932d47448c
commit a427503eda
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/power/supply/generic-adc-battery.c
View File

@ -244,6 +244,7 @@ static int gab_probe(struct platform_device *pdev)
int ret = 0; int ret = 0;
int chan; int chan;
int index = ARRAY_SIZE(gab_props); int index = ARRAY_SIZE(gab_props);
bool any = false;
adc_bat = devm_kzalloc(&pdev->dev, sizeof(*adc_bat), GFP_KERNEL); adc_bat = devm_kzalloc(&pdev->dev, sizeof(*adc_bat), GFP_KERNEL);
if (!adc_bat) { if (!adc_bat) {
@ -290,12 +291,22 @@ static int gab_probe(struct platform_device *pdev)
adc_bat->channel[chan] = NULL; adc_bat->channel[chan] = NULL;
} else { } else {
/* copying properties for supported channels only */ /* copying properties for supported channels only */
psy_desc->properties[index++] = gab_dyn_props[chan]; int index2;
for (index2 = 0; index2 < index; index2++) {
if (psy_desc->properties[index2] ==
gab_dyn_props[chan])
break; /* already known */
}
if (index2 == index) /* really new */
psy_desc->properties[index++] =
gab_dyn_props[chan];
any = true;
} }
} }
/* none of the channels are supported so let's bail out */ /* none of the channels are supported so let's bail out */
if (index == ARRAY_SIZE(gab_props)) { if (!any) {
ret = -ENODEV; ret = -ENODEV;
goto second_mem_fail; goto second_mem_fail;
} }