diff options
author | Julia Lawall <julia@diku.dk> | 2011-08-08 07:18:03 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-10 14:07:10 -0400 |
commit | 059c4383550b158bc1b6d34d8ab085e81cb3d71b (patch) | |
tree | 903a3b657555ae78c576150f054a2e143ea539b6 /drivers/net | |
parent | bdc71bc59231f5542af13b5061b9ab124d093050 (diff) |
drivers/net/wireless/wl1251: add missing kfree
In each case, the kfree already at the end of the function is also needed
in the error case.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@exists@
local idexpression x;
statement S,S1;
expression E;
identifier fl;
expression *ptr != NULL;
@@
x = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
when != if (...) { <+...kfree(x)...+> }
when any
when != true x == NULL
x->fl
...>
(
if (x == NULL) S1
|
if (...) { ... when != x
when forall
(
return \(0\|<+...x...+>\|ptr\);
|
* return ...;
)
}
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/wl1251/acx.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/wl1251/cmd.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl1251/acx.c b/drivers/net/wireless/wl1251/acx.c index ef8370edace7..ad87a1ac6462 100644 --- a/drivers/net/wireless/wl1251/acx.c +++ b/drivers/net/wireless/wl1251/acx.c | |||
@@ -140,8 +140,6 @@ int wl1251_acx_sleep_auth(struct wl1251 *wl, u8 sleep_auth) | |||
140 | auth->sleep_auth = sleep_auth; | 140 | auth->sleep_auth = sleep_auth; |
141 | 141 | ||
142 | ret = wl1251_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth)); | 142 | ret = wl1251_cmd_configure(wl, ACX_SLEEP_AUTH, auth, sizeof(*auth)); |
143 | if (ret < 0) | ||
144 | return ret; | ||
145 | 143 | ||
146 | out: | 144 | out: |
147 | kfree(auth); | 145 | kfree(auth); |
@@ -681,10 +679,8 @@ int wl1251_acx_cca_threshold(struct wl1251 *wl) | |||
681 | 679 | ||
682 | ret = wl1251_cmd_configure(wl, ACX_CCA_THRESHOLD, | 680 | ret = wl1251_cmd_configure(wl, ACX_CCA_THRESHOLD, |
683 | detection, sizeof(*detection)); | 681 | detection, sizeof(*detection)); |
684 | if (ret < 0) { | 682 | if (ret < 0) |
685 | wl1251_warning("failed to set cca threshold: %d", ret); | 683 | wl1251_warning("failed to set cca threshold: %d", ret); |
686 | return ret; | ||
687 | } | ||
688 | 684 | ||
689 | out: | 685 | out: |
690 | kfree(detection); | 686 | kfree(detection); |
diff --git a/drivers/net/wireless/wl1251/cmd.c b/drivers/net/wireless/wl1251/cmd.c index 81f164bc4888..d14d69d733a0 100644 --- a/drivers/net/wireless/wl1251/cmd.c +++ b/drivers/net/wireless/wl1251/cmd.c | |||
@@ -241,7 +241,7 @@ int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable) | |||
241 | if (ret < 0) { | 241 | if (ret < 0) { |
242 | wl1251_error("tx %s cmd for channel %d failed", | 242 | wl1251_error("tx %s cmd for channel %d failed", |
243 | enable ? "start" : "stop", channel); | 243 | enable ? "start" : "stop", channel); |
244 | return ret; | 244 | goto out; |
245 | } | 245 | } |
246 | 246 | ||
247 | wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d", | 247 | wl1251_debug(DEBUG_BOOT, "tx %s cmd channel %d", |