diff options
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/mac80211_if.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/mac80211_if.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c index bd989737..6ed80b2 100644 --- a/drivers/staging/brcm80211/brcmsmac/mac80211_if.c +++ b/drivers/staging/brcm80211/brcmsmac/mac80211_if.c @@ -96,7 +96,7 @@ struct firmware_hdr { u32 idx; }; -char *brcms_firmwares[MAX_FW_IMAGES] = { +static const char * const brcms_firmwares[MAX_FW_IMAGES] = { "brcm/bcm43xx", NULL }; @@ -1012,7 +1012,7 @@ static void brcms_free(struct brcms_info *wl) * after calling unregister_netdev() . */ if (wl->regsva) - iounmap((void *)wl->regsva); + iounmap(wl->regsva); wl->regsva = NULL; } @@ -1596,7 +1596,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl, if (!t) { wiphy_err(wl->wiphy, "wl%d: brcms_init_timer: out of memory\n", wl->pub->unit); - return 0; + return NULL; } init_timer(&t->timer); |