[PATCH] i2c: efm32: correct namespacing of location property
From: Uwe Kleine-König <hidden>
Date: 2014-07-11 08:28:26
Also in:
linux-devicetree, linux-i2c
Hi Wolfram,
quoted hunk
diff --git a/drivers/i2c/busses/i2c-efm32.c b/drivers/i2c/busses/i2c-efm32.c index f7eccd682de9..5c4cf94527e3 100644 --- a/drivers/i2c/busses/i2c-efm32.c +++ b/drivers/i2c/busses/i2c-efm32.c@@ -370,7 +370,13 @@ static int efm32_i2c_probe(struct platform_device *pdev) return ret; } - ret = of_property_read_u32(np, "efm32,location", &location); + + ret = of_property_read_u32(np, "energymicro,location", &location); + + if (!ret)
This must be "if (ret)". I noticed during testing but obviously forgot to fixup before sending out. Should I resend? Best regards Uwe
+ /* fall back to wrongly namespaced property */
+ ret = of_property_read_u32(np, "efm32,location", &location);
+
if (!ret) {
dev_dbg(&pdev->dev, "using location %u\n", location);
} else {-- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |