FAILED: patch "[PATCH] power: generic-adc-battery: check for duplicate properties" failed to apply to 4.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
a427503edaaed9b75ed9746a654cece7e93e60a8Mon Sep 17 00:00:00 2001
From: "H. Nikolaus Schaller" <[email protected]>
Date: Tue, 26 Jun 2018 15:28:30 +0200
Subject: [PATCH] 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.
drivers/power/supply/generic-adc-battery.c +13 -2
@@ -244,6 +244,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) {
@@ -290,12 +291,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; }