diff options
| author | Arend van Spriel | 2011-08-08 15:58:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-08-23 22:00:02 +0200 |
| commit | 3f7e0c5df5910157441b680622447c903436f04a (patch) | |
| tree | 263eb421b568c87ab3112bf711b2e28f84e8f3df /drivers/staging/brcm80211/brcmsmac/phy | |
| parent | staging: brcm80211: removed global variable from sdio fullmac (diff) | |
| download | kernel-qcow2-linux-3f7e0c5df5910157441b680622447c903436f04a.tar.gz kernel-qcow2-linux-3f7e0c5df5910157441b680622447c903436f04a.tar.xz kernel-qcow2-linux-3f7e0c5df5910157441b680622447c903436f04a.zip | |
staging: brcm80211: replace simple_strtoul usage in brcmsmac
The usage of simple_strtoul is not preferred. Instead kstrtoul
should be used. This patch fixes this for the brcmsmac driver.
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index 582df4a248bb..22f7bfc79dde 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -174,12 +174,13 @@ char *phy_getvar(struct brcms_phy *pi, const char *name) int phy_getintvar(struct brcms_phy *pi, const char *name) { char *val; + unsigned long res; val = PHY_GETVAR(pi, name); - if (val == NULL) - return 0; + if (val && !kstrtoul(val, 0, &res)) + return res; - return simple_strtoul(val, NULL, 0); + return 0; } void wlc_phyreg_enter(struct brcms_phy_pub *pih) |