[RESEND PATCH 5/6] mfd: ti_am335x_tscadc: fix reading a tsc property from DT

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



There was a spelling mistake on TSC/ADC binding where "coordinate" was
spelled as "coordiante".

As done by commit c9aeb249bf72 ("Input: ti_am335x_tsc - fix spelling
mistake in TSC/ADC DT binding"), "the approach taken was to first use
correct spelling and if that fails, fall back to miss-spelled version".

Signed-off-by: Dario Binacchi <dariobin@xxxxxxxxx>
---

 drivers/mfd/ti_am335x_tscadc.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 55adc379f94b..53b7a8b7f571 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -141,7 +141,12 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 
 	node = of_get_child_by_name(pdev->dev.of_node, "tsc");
 	of_property_read_u32(node, "ti,wires", &tsc_wires);
-	of_property_read_u32(node, "ti,coordiante-readouts", &readouts);
+	/*
+	 * Try with the new binding first. If it fails, try again with
+	 * bogus, miss-spelled version.
+	 */
+	if (of_property_read_u32(node, "ti,coordinate-readouts", &readouts))
+		of_property_read_u32(node, "ti,coordiante-readouts", &readouts);
 
 	node = of_get_child_by_name(pdev->dev.of_node, "adc");
 	of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) {
-- 
2.17.1




[Index of Archives]     [Linux Media Devel]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Linux Wireless Networking]     [Linux Omap]

  Powered by Linux