diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-15 01:02:28 +0200 |
| commit | 1db3706b05b11abcf2673ffbed5ad43b4c90ed11 (patch) | |
| tree | 09fa867d9d9db6ed475eaa889da143603441e1a6 /drivers/net/wireless/wl12xx/acx.c | |
| parent | Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into dev... (diff) | |
| parent | ARM: zImage: prevent constant copy+rebuild of lib1funcs.S (diff) | |
| download | linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.tar.xz linux-1db3706b05b11abcf2673ffbed5ad43b4c90ed11.zip | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'drivers/net/wireless/wl12xx/acx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/acx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index 7e33f1f4f3d4..34f6ab53e519 100644 --- a/drivers/net/wireless/wl12xx/acx.c +++ b/drivers/net/wireless/wl12xx/acx.c @@ -77,8 +77,6 @@ int wl1271_acx_sleep_auth(struct wl1271 *wl, u8 sleep_auth) auth->sleep_auth = sleep_auth; ret = wl1271_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth)); - if (ret < 0) - return ret; out: kfree(auth); @@ -624,10 +622,8 @@ int wl1271_acx_cca_threshold(struct wl1271 *wl) ret = wl1271_cmd_configure(wl, ACX_CCA_THRESHOLD, detection, sizeof(*detection)); - if (ret < 0) { + if (ret < 0) wl1271_warning("failed to set cca threshold: %d", ret); - return ret; - } out: kfree(detection); |