From cb99795692554a614f2c6832acf4c77ad2f1c75b Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Thu, 5 Jul 2012 17:30:58 +0300 Subject: [PATCH] --- yaml --- r: 315637 b: refs/heads/master c: 45777c49ec376f5325e9ebbca85ee3e71697b0d2 h: refs/heads/master i: 315635: a910f326b679575a5ba713fc720d3f21f4ad1e82 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wl18xx/main.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b13be89b9a20..661f47e6bb61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 097b0e1bf18a00195cd89bb13565ddbc9b0df942 +refs/heads/master: 45777c49ec376f5325e9ebbca85ee3e71697b0d2 diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c index b378b34c4a6a..8bb21b6458b8 100644 --- a/trunk/drivers/net/wireless/ti/wl18xx/main.c +++ b/trunk/drivers/net/wireless/ti/wl18xx/main.c @@ -772,16 +772,24 @@ static int wl18xx_pre_upload(struct wl1271 *wl) static int wl18xx_set_mac_and_phy(struct wl1271 *wl) { struct wl18xx_priv *priv = wl->priv; + struct wl18xx_mac_and_phy_params *params; int ret; + params = kmemdup(&priv->conf.phy, sizeof(*params), GFP_KERNEL); + if (!params) { + ret = -ENOMEM; + goto out; + } + ret = wlcore_set_partition(wl, &wl->ptable[PART_PHY_INIT]); if (ret < 0) goto out; - ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, (u8 *)&priv->conf.phy, - sizeof(struct wl18xx_mac_and_phy_params), false); + ret = wlcore_write(wl, WL18XX_PHY_INIT_MEM_ADDR, params, + sizeof(*params), false); out: + kfree(params); return ret; }