diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-06-11 12:30:50 +0000 |
| commit | 3153b7589c0831fdce97081d1ecf5b9310725576 (patch) | |
| tree | 5e4608250807827642c1d1fb19849d3671443ae7 /package/mac80211/patches/a10-rt2x00_clk_get_revert.patch | |
| parent | 312a176995ecf1b1b97a048451e4ff28b4336f85 (diff) | |
| download | upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.gz upstream-3153b7589c0831fdce97081d1ecf5b9310725576.tar.bz2 upstream-3153b7589c0831fdce97081d1ecf5b9310725576.zip | |
AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@41116 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/a10-rt2x00_clk_get_revert.patch')
| -rw-r--r-- | package/mac80211/patches/a10-rt2x00_clk_get_revert.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/mac80211/patches/a10-rt2x00_clk_get_revert.patch b/package/mac80211/patches/a10-rt2x00_clk_get_revert.patch new file mode 100644 index 0000000000..d9a2be8529 --- /dev/null +++ b/package/mac80211/patches/a10-rt2x00_clk_get_revert.patch @@ -0,0 +1,29 @@ +--- a/drivers/net/wireless/rt2x00/rt2800lib.c ++++ b/drivers/net/wireless/rt2x00/rt2800lib.c +@@ -36,7 +36,6 @@ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/slab.h> +-#include <linux/clk.h> + #include <linux/of.h> + + #include "rt2x00.h" +@@ -8622,14 +8621,13 @@ static int rt2800_probe_rt(struct rt2x00 + + int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev) + { ++ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data; + struct hw_mode_spec *spec = &rt2x00dev->spec; +- struct clk *clk = clk_get(rt2x00dev->dev, NULL); + +- if (IS_ERR(clk)) +- return PTR_ERR(clk); ++ if (!pdata) ++ return -EINVAL; + +- if (clk_get_rate(clk) == 20000000) +- spec->clk_is_20mhz = 1; ++ spec->clk_is_20mhz = pdata->clk_is_20mhz; + + return 0; + } |