Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea05995 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman
Browse files

iio: exynos-adc: request second interupt only when touchscreen mode is used 



[ Upstream commit 865b080e3229102f160889328ce2e8e97aa65ea0 ]

Second interrupt is needed only when touchscreen mode is used, so don't
request it unconditionally. This removes the following annoying warning
during boot:

exynos-adc 14d10000.adc: error -ENXIO: IRQ index 1 not found

Fixes: 2bb8ad9b ("iio: exynos-adc: add experimental touchscreen support")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20231009101412.916922-1-m.szyprowski@samsung.com


Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c9e02711

drivers/iio/adc/exynos_adc.c

+14 −10
Original line number Diff line number Diff line
@@ -817,6 +817,12 @@ static int exynos_adc_probe(struct platform_device *pdev) 
		}

	}



	/* leave out any TS related code if unreachable */

	if (IS_REACHABLE(CONFIG_INPUT)) {

		has_ts = of_property_read_bool(pdev->dev.of_node,

					       "has-touchscreen") || pdata;

	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "no irq resource?\n");
@@ -824,11 +830,15 @@ static int exynos_adc_probe(struct platform_device *pdev) 
	}

	info->irq = irq;



	if (has_ts) {

		irq = platform_get_irq(pdev, 1);

		if (irq == -EPROBE_DEFER)

			return irq;



		info->tsirq = irq;

	} else {

		info->tsirq = -1;

	}



	info->dev = &pdev->dev;
@@ -895,12 +905,6 @@ static int exynos_adc_probe(struct platform_device *pdev) 
	if (info->data->init_hw)

		info->data->init_hw(info);



	/* leave out any TS related code if unreachable */

	if (IS_REACHABLE(CONFIG_INPUT)) {

		has_ts = of_property_read_bool(pdev->dev.of_node,

					       "has-touchscreen") || pdata;

	}



	if (pdata)

		info->delay = pdata->delay;

	else