From 43c471428f81d7edad94feea07a14ad40c1fa18b Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Sun, 12 Oct 2008 20:15:43 +0400 Subject: [PATCH] --- yaml --- r: 121659 b: refs/heads/master c: 0df6cbb7d8a0a8fea69138e9e463671a8ad99f16 h: refs/heads/master i: 121657: 12796da3165c22ded7441d2c94b5b851f6985e7d 121655: 2fca4b169749ce5c598e9b6ee4faa7e365ab6355 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/orinoco.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 80f3402b8a38..3ba2a3292f87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c674c60bd567597f1224973712b352f4f474890 +refs/heads/master: 0df6cbb7d8a0a8fea69138e9e463671a8ad99f16 diff --git a/trunk/drivers/net/wireless/orinoco.c b/trunk/drivers/net/wireless/orinoco.c index 366556fafaee..7bd1559e8711 100644 --- a/trunk/drivers/net/wireless/orinoco.c +++ b/trunk/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",