lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

orinoco: reload firmware on resume

Browse Source 
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>
This commit is contained in:
Andrey Borzenkov
2008-10-12 20:15:43 +04:00
committed by John W. Linville
parent 4c674c60bd
commit 0df6cbb7d8
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/orinoco.c
View File

@@ -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)
} }
} }
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",