summaryrefslogtreecommitdiffstats
path: root/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2013-12-19 02:03:26 +0000
committerLuka Perkov <luka@openwrt.org>2013-12-19 02:03:26 +0000
commit5db5354c708f62a5c4814342334951dbd4e089e7 (patch)
tree84434353e2094cb69ff48d8ab92f29f34036c20f /target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
parent76325355894d7816ecd3cfc1f0eeaee853398b0f (diff)
downloadmaster-31e0f0ae-5db5354c708f62a5c4814342334951dbd4e089e7.tar.gz
master-31e0f0ae-5db5354c708f62a5c4814342334951dbd4e089e7.tar.bz2
master-31e0f0ae-5db5354c708f62a5c4814342334951dbd4e089e7.zip
imx6: refresh patches
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 39135
Diffstat (limited to 'target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch')
-rw-r--r--target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch b/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
index c35d7c90c2..5553101cc1 100644
--- a/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
+++ b/target/linux/imx6/patches-3.10/0061-can-flexcan-use-correct-clock-as-base-for-bit-rate-c.patch
@@ -19,7 +19,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
-@@ -1025,7 +1025,6 @@ static int flexcan_probe(struct platform
+@@ -1019,7 +1019,6 @@ static int flexcan_probe(struct platform
err = PTR_ERR(clk_ipg);
goto failed_clock;
}
@@ -27,7 +27,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
clk_per = devm_clk_get(&pdev->dev, "per");
if (IS_ERR(clk_per)) {
-@@ -1033,6 +1032,7 @@ static int flexcan_probe(struct platform
+@@ -1027,6 +1026,7 @@ static int flexcan_probe(struct platform
err = PTR_ERR(clk_per);
goto failed_clock;
}