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

Commit a969dd13 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents d31bb4f0 85f2f834
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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) {