aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAndrey Borzenkov <arvidjaar@mail.ru>2008-10-12 20:15:43 +0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:02:33 -0400
commit0df6cbb7d8a0a8fea69138e9e463671a8ad99f16 (patch)
tree2fa02df802931939e7f9e056296a2ce1d6243d53 /drivers/net
parent4c674c60bd567597f1224973712b352f4f474890 (diff)
orinoco: reload firmware on resume
On resume card state is likely lost so we have to reload firmware again. Signed-off-by: Andrey Borzenkov <arvidjaar@mail.ru> Acked-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/orinoco.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 366556fafae..7bd1559e871 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -2300,6 +2300,11 @@ int orinoco_reinit_firmware(struct net_device *dev)
int err;
err = hermes_init(hw);
+ if (priv->do_fw_download && !err) {
+ err = orinoco_download(priv);
+ if (err)
+ priv->do_fw_download = 0;
+ }
if (!err)
err = orinoco_allocate_fid(dev);
@@ -2925,12 +2930,6 @@ static void orinoco_reset(struct work_struct *work)
}
}
- if (priv->do_fw_download) {
- err = orinoco_download(priv);
- if (err)
- priv->do_fw_download = 0;
- }
-
err = orinoco_reinit_firmware(dev);
if (err) {
printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",