From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Date: Wed, 18 Jan 2023 12:06:23 +0200

Subject: [PATCH] iio: adc: qcom-spmi-adc5: Fix the channel name

References: bsc#1012628

Patch-mainline: 6.2.11

Git-commit: 701c875aded880013aacac608832995c4b052257

commit 701c875aded880013aacac608832995c4b052257 upstream.

The node name can contain an address part which is unused

by the driver. Moreover, this string is propagated into

the userspace label, sysfs filenames *and breaking ABI*.

Cut the address part out before assigning the channel name.

Fixes: 4f47a236a23d ("iio: adc: qcom-spmi-adc5: convert to device properties")

Reported-by: Marijn Suijten <marijn.suijten@somainline.org>

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>

Link: https://lore.kernel.org/r/20230118100623.42255-1-andriy.shevchenko@linux.intel.com

Cc: <Stable@vger.kernel.org>

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/iio/adc/qcom-spmi-adc5.c | 10 +++++++++-

 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c

index 821fee60..d1b86570 100644

--- a/drivers/iio/adc/qcom-spmi-adc5.c

+++ b/drivers/iio/adc/qcom-spmi-adc5.c

@@ -626,12 +626,20 @@ static int adc5_get_fw_channel_data(struct adc5_chip *adc,

 				    struct fwnode_handle *fwnode,

 				    const struct adc5_data *data)

 {

-	const char *name = fwnode_get_name(fwnode), *channel_name;

+	const char *channel_name;

+	char *name;

 	u32 chan, value, varr[2];

 	u32 sid = 0;

 	int ret;

 	struct device *dev = adc->dev;

+	name = devm_kasprintf(dev, GFP_KERNEL, "%pfwP", fwnode);

+	if (!name)

+		return -ENOMEM;

+

+	/* Cut the address part */

+	name[strchrnul(name, '@') - name] = '\0';

+

 	ret = fwnode_property_read_u32(fwnode, "reg", &chan);

 	if (ret) {

 		dev_err(dev, "invalid channel number %s\n", name);

-- 

2.35.3