diff options
| author | Pavel Roskin <proski@gnu.org> | 2011-06-29 15:39:37 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-05 14:41:13 -0400 |
| commit | 95acbd432b4c6498c5b4b2f92e0e05e3c032d4f8 (patch) | |
| tree | 78ba2d5d9b0122b454513c04a057abe761d027c8 /drivers/net | |
| parent | f2529c2cc80b72fcf889a9399e522b9648ab4d9e (diff) | |
ath5k: fix incorrect use of drvdata in sysfs code
Signed-off-by: Pavel Roskin <proski@gnu.org>
Cc: <stable@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/sysfs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c index 929c68cdf8ab..a073cdce1f15 100644 --- a/drivers/net/wireless/ath/ath5k/sysfs.c +++ b/drivers/net/wireless/ath/ath5k/sysfs.c | |||
| @@ -10,7 +10,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ | |||
| 10 | struct device_attribute *attr, \ | 10 | struct device_attribute *attr, \ |
| 11 | char *buf) \ | 11 | char *buf) \ |
| 12 | { \ | 12 | { \ |
| 13 | struct ath5k_softc *sc = dev_get_drvdata(dev); \ | 13 | struct ieee80211_hw *hw = dev_get_drvdata(dev); \ |
| 14 | struct ath5k_softc *sc = hw->priv; \ | ||
| 14 | return snprintf(buf, PAGE_SIZE, "%d\n", get); \ | 15 | return snprintf(buf, PAGE_SIZE, "%d\n", get); \ |
| 15 | } \ | 16 | } \ |
| 16 | \ | 17 | \ |
| @@ -18,7 +19,8 @@ static ssize_t ath5k_attr_store_##name(struct device *dev, \ | |||
| 18 | struct device_attribute *attr, \ | 19 | struct device_attribute *attr, \ |
| 19 | const char *buf, size_t count) \ | 20 | const char *buf, size_t count) \ |
| 20 | { \ | 21 | { \ |
| 21 | struct ath5k_softc *sc = dev_get_drvdata(dev); \ | 22 | struct ieee80211_hw *hw = dev_get_drvdata(dev); \ |
| 23 | struct ath5k_softc *sc = hw->priv; \ | ||
| 22 | int val; \ | 24 | int val; \ |
| 23 | \ | 25 | \ |
| 24 | val = (int)simple_strtoul(buf, NULL, 10); \ | 26 | val = (int)simple_strtoul(buf, NULL, 10); \ |
| @@ -33,7 +35,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ | |||
| 33 | struct device_attribute *attr, \ | 35 | struct device_attribute *attr, \ |
| 34 | char *buf) \ | 36 | char *buf) \ |
| 35 | { \ | 37 | { \ |
| 36 | struct ath5k_softc *sc = dev_get_drvdata(dev); \ | 38 | struct ieee80211_hw *hw = dev_get_drvdata(dev); \ |
| 39 | struct ath5k_softc *sc = hw->priv; \ | ||
| 37 | return snprintf(buf, PAGE_SIZE, "%d\n", get); \ | 40 | return snprintf(buf, PAGE_SIZE, "%d\n", get); \ |
| 38 | } \ | 41 | } \ |
| 39 | static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL) | 42 | static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL) |