orinoco: reload firmware on resume

PATCH New Andrey Borzenkov 1 participant 1 message Oct 26, 2008 Networking drivers (wireless)

Share & tools

Andrey Borzenkov

author

2008-10-26 08:21 UTC #0 lore raw

PATCH 1/2 orinoco: reload firmware on resume

From: Andrey Borzenkov <[email protected]>
Date: Sun, 12 Oct 2008 20:15:43 +0400
Subject: [PATCH 1/2] orinoco: reload firmware on resume

On resume card state is likely lost so we have to reload firmware again.

Signed-off-by Andrey Borzenkov <[email protected]>

Acked-by David Kilroy <[email protected]>

---

Resend against current wireless-testing

 drivers/net/wireless/orinoco.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

drivers/net/wireless/orinoco.c +5 -6

index e0512e4..860803e 100644
@@ -2301,6 +2301,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);

@@ -2926,12 +2931,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",

Signature · 1 line

1.6.0.2