aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-08-17 16:10:49 +0000
committerJohn Crispin <john@openwrt.org>2015-08-17 16:10:49 +0000
commit0ff8c94aab519cb7cb45f26cd0bd96c76c3330f5 (patch)
tree72b578dd0ea5d80d2b055d0a9bde91ade26391e3 /target/linux/at91
parent8411858194dbc037d1747359f6fd8bc78258e666 (diff)
downloadupstream-0ff8c94aab519cb7cb45f26cd0bd96c76c3330f5.tar.gz
upstream-0ff8c94aab519cb7cb45f26cd0bd96c76c3330f5.tar.bz2
upstream-0ff8c94aab519cb7cb45f26cd0bd96c76c3330f5.zip
at91: fix usb rate backport patch tab mangle
The patch submitted in [46649] was mangled in the use of gmails webmail interface, tabs replaced with spaces, resulting in a patch which dit not apply. This should fix the issue, sorry for the noise. Signed-off-by: Ben Whitten <benwhitten@gmail.com> SVN-Revision: 46676
Diffstat (limited to 'target/linux/at91')
-rw-r--r--target/linux/at91/patches/201-ARM-at91-usb-determine_rate-backport.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/at91/patches/201-ARM-at91-usb-determine_rate-backport.patch b/target/linux/at91/patches/201-ARM-at91-usb-determine_rate-backport.patch
index 4fc22ab525..d0836286bf 100644
--- a/target/linux/at91/patches/201-ARM-at91-usb-determine_rate-backport.patch
+++ b/target/linux/at91/patches/201-ARM-at91-usb-determine_rate-backport.patch
@@ -2,19 +2,19 @@
+++ b/drivers/clk/at91/clk-usb.c
@@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_
static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw,
- unsigned long rate,
- unsigned long *best_parent_rate,
-- struct clk_hw **best_parent_hw)
-+ struct clk **best_parent_clk)
+ unsigned long rate,
+ unsigned long *best_parent_rate,
+- struct clk_hw **best_parent_hw)
++ struct clk **best_parent_clk)
{
- struct clk *parent = NULL;
- long best_rate = -EINVAL;
+ struct clk *parent = NULL;
+ long best_rate = -EINVAL;
@@ -91,7 +91,7 @@ static long at91sam9x5_clk_usb_determine
- best_rate = tmp_rate;
- best_diff = tmp_diff;
- *best_parent_rate = tmp_parent_rate;
-- *best_parent_hw = __clk_get_hw(parent);
-+ *best_parent_clk = parent;
- }
-
- if (!best_diff || tmp_rate < rate)
+ best_rate = tmp_rate;
+ best_diff = tmp_diff;
+ *best_parent_rate = tmp_parent_rate;
+- *best_parent_hw = __clk_get_hw(parent);
++ *best_parent_clk = parent;
+ }
+
+ if (!best_diff || tmp_rate < rate)