mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
power: generic-adc-battery: check for duplicate properties copied from iio channels
commita427503eda
upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
54cecb7440
commit
f9f67667e0
1 changed files with 13 additions and 2 deletions
|
@ -246,6 +246,7 @@ static int gab_probe(struct platform_device *pdev)
|
|||
int ret = 0;
|
||||
int chan;
|
||||
int index = ARRAY_SIZE(gab_props);
|
||||
bool any = false;
|
||||
|
||||
adc_bat = devm_kzalloc(&pdev->dev, sizeof(*adc_bat), GFP_KERNEL);
|
||||
if (!adc_bat) {
|
||||
|
@ -292,12 +293,22 @@ static int gab_probe(struct platform_device *pdev)
|
|||
adc_bat->channel[chan] = NULL;
|
||||
} else {
|
||||
/* 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 */
|
||||
if (index == ARRAY_SIZE(gab_props)) {
|
||||
if (!any) {
|
||||
ret = -ENODEV;
|
||||
goto second_mem_fail;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue