Commit 0df6cbb7 authored by Andrey Borzenkov's avatar Andrey Borzenkov Committed by John W. Linville

orinoco: reload firmware on resume

On resume card state is likely lost so we have to reload firmware
again.
Signed-off-by: default avatarAndrey Borzenkov <arvidjaar@mail.ru>
Acked-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4c674c60
...@@ -2300,6 +2300,11 @@ int orinoco_reinit_firmware(struct net_device *dev) ...@@ -2300,6 +2300,11 @@ int orinoco_reinit_firmware(struct net_device *dev)
int err; int err;
err = hermes_init(hw); err = hermes_init(hw);
if (priv->do_fw_download && !err) {
err = orinoco_download(priv);
if (err)
priv->do_fw_download = 0;
}
if (!err) if (!err)
err = orinoco_allocate_fid(dev); err = orinoco_allocate_fid(dev);
...@@ -2925,12 +2930,6 @@ static void orinoco_reset(struct work_struct *work) ...@@ -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); err = orinoco_reinit_firmware(dev);
if (err) { if (err) {
printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n", printk(KERN_ERR "%s: orinoco_reset: Error %d re-initializing firmware\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment