lkml.org 
[lkml]   [2011]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[39/70] ath5k: fix incorrect use of drvdata in sysfs code
    2.6.39-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Pavel Roskin <proski@gnu.org>

    commit 95acbd432b4c6498c5b4b2f92e0e05e3c032d4f8 upstream.

    Signed-off-by: Pavel Roskin <proski@gnu.org>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/ath/ath5k/sysfs.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- 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(st
    struct device_attribute *attr, \
    char *buf) \
    { \
    - struct ath5k_softc *sc = dev_get_drvdata(dev); \
    + struct ieee80211_hw *hw = dev_get_drvdata(dev); \
    + struct ath5k_softc *sc = hw->priv; \
    return snprintf(buf, PAGE_SIZE, "%d\n", get); \
    } \
    \
    @@ -18,7 +19,8 @@ static ssize_t ath5k_attr_store_##name(s
    struct device_attribute *attr, \
    const char *buf, size_t count) \
    { \
    - struct ath5k_softc *sc = dev_get_drvdata(dev); \
    + struct ieee80211_hw *hw = dev_get_drvdata(dev); \
    + struct ath5k_softc *sc = hw->priv; \
    int val; \
    \
    val = (int)simple_strtoul(buf, NULL, 10); \
    @@ -33,7 +35,8 @@ static ssize_t ath5k_attr_show_##name(st
    struct device_attribute *attr, \
    char *buf) \
    { \
    - struct ath5k_softc *sc = dev_get_drvdata(dev); \
    + struct ieee80211_hw *hw = dev_get_drvdata(dev); \
    + struct ath5k_softc *sc = hw->priv; \
    return snprintf(buf, PAGE_SIZE, "%d\n", get); \
    } \
    static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL)



    \
     
     \ /
      Last update: 2011-08-02 01:37    [W:0.019 / U:32.012 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site