diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:48:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:48:27 +1000 |
| commit | 6d891a1c48e046119903e3df5407bb747692548e (patch) | |
| tree | e6adf3ec1baaa5ce416de5c258f3b5f2abb42a9f /drivers/net/wireless/wl12xx/wl1251_cmd.c | |
| parent | 40f9aa93e528e01f194f2f2fa5e81b572a6f5f12 (diff) | |
| parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
Merge remote branch 'net/master'
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c index ce3722f4c3e3..15fb68c6b542 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c @@ -200,7 +200,7 @@ int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity, out: kfree(vbm); - return 0; + return ret; } int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable) |