diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-27 15:27:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-27 15:27:24 -0700 |
| commit | a969dd139cc2f2bccdcb11894f0695517cf84d4d (patch) | |
| tree | d63b6a9d5921954f62d0e5ae88fded7b11a781aa /drivers/net | |
| parent | d31bb4f0621756528d11d310c44cd8076b22bc03 (diff) | |
| parent | 85f2f834e85517307f13e30e630a5fc86f757cb5 (diff) | |
| download | op-kernel-dev-a969dd139cc2f2bccdcb11894f0695517cf84d4d.zip op-kernel-dev-a969dd139cc2f2bccdcb11894f0695517cf84d4d.tar.gz | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/flexcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 38c0690..81d4741 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -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) { |
