Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says: ==================== here's a patch intended for v3.5, targeting net/master. Hui Wang has found and fixed an endianness problem in the device tree handling in the flexcan driver. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
a969dd139c
|
@ -939,12 +939,12 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
|
|||
return PTR_ERR(pinctrl);
|
||||
|
||||
if (pdev->dev.of_node) {
|
||||
const u32 *clock_freq_p;
|
||||
const __be32 *clock_freq_p;
|
||||
|
||||
clock_freq_p = of_get_property(pdev->dev.of_node,
|
||||
"clock-frequency", NULL);
|
||||
if (clock_freq_p)
|
||||
clock_freq = *clock_freq_p;
|
||||
clock_freq = be32_to_cpup(clock_freq_p);
|
||||
}
|
||||
|
||||
if (!clock_freq) {
|
||||
|
|
Loading…
Reference in New Issue