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

commit a427503edaaed9b75ed9746a654cece7e93e60a8 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: e60fea794e6e ("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>

diff --git a/drivers/power/supply/generic-adc-battery.c b/drivers/power/supply/generic-adc-battery.c
index 9d3dbb5b8e986504717470d532f933751547751f..371b5ec700870f0b3bc23f62ed939fc717644185 100644 (file)
--- a/drivers/power/supply/generic-adc-battery.c
+++ b/drivers/power/supply/generic-adc-battery.c
@@ -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;
        }