Skip to content

Commit

Permalink
orinoco: reload firmware on resume
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrey Borzenkov authored and John W. Linville committed Oct 31, 2008
1 parent 4c674c6 commit 0df6cbb
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/net/wireless/orinoco.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 0df6cbb

Please sign in to comment.