提交 0df6cbb7 编写于 作者: A Andrey Borzenkov 提交者: 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: NAndrey Borzenkov <arvidjaar@mail.ru>
Acked-by: NDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 4c674c60
......@@ -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",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册