diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-03-19 22:21:44 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-03-23 16:16:57 -0500 |
| commit | 971d1e69229f3dfc6dd233b8f4b82df2c35eedd8 (patch) | |
| tree | a255814d0183a9d6541e3206c10ad966836d3856 | |
| parent | 9e75af30d529d54fc650586776c100d0665c0c93 (diff) | |
[PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
The Coverity checker (CID: 59) noted that the call to prism2_hw_reset()
was dead code. Move prism2_hw_reset() call to a place where it is
actually executed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_hw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c index b1f142d9e232..328e9a1d13b5 100644 --- a/drivers/net/wireless/hostap/hostap_hw.c +++ b/drivers/net/wireless/hostap/hostap_hw.c | |||
| @@ -928,15 +928,15 @@ static int hfa384x_set_rid(struct net_device *dev, u16 rid, void *buf, int len) | |||
| 928 | 928 | ||
| 929 | res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL); | 929 | res = hfa384x_cmd(dev, HFA384X_CMDCODE_ACCESS_WRITE, rid, NULL, NULL); |
| 930 | up(&local->rid_bap_sem); | 930 | up(&local->rid_bap_sem); |
| 931 | |||
| 931 | if (res) { | 932 | if (res) { |
| 932 | printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE " | 933 | printk(KERN_DEBUG "%s: hfa384x_set_rid: CMDCODE_ACCESS_WRITE " |
| 933 | "failed (res=%d, rid=%04x, len=%d)\n", | 934 | "failed (res=%d, rid=%04x, len=%d)\n", |
| 934 | dev->name, res, rid, len); | 935 | dev->name, res, rid, len); |
| 935 | return res; | ||
| 936 | } | ||
| 937 | 936 | ||
| 938 | if (res == -ETIMEDOUT) | 937 | if (res == -ETIMEDOUT) |
| 939 | prism2_hw_reset(dev); | 938 | prism2_hw_reset(dev); |
| 939 | } | ||
| 940 | 940 | ||
| 941 | return res; | 941 | return res; |
| 942 | } | 942 | } |
