openwrt_archive/package/mac80211/patches/a10-rt2x00_clk_get_revert.patch
Felix Fietkau fdba4f097d AA: mac80211: sync with trunk r41113
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41116
2014-06-11 12:30:50 +00:00

30 lines
755 B
Diff

--- 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;
}