From: Cindy H Kao <cindy.h.kao@intel.com>
Date: Wed, 10 Jun 2009 23:52:10 +0000 (-0700)
Subject: wimax/i2400m: when bootstrap fails, reinitialize the bootrom
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8b5b30ee7ddc989b59ce05dcf2d024a819dc8040;p=deliverable%2Flinux.git

wimax/i2400m: when bootstrap fails, reinitialize the bootrom

When a device reset happens during firmware load [in
i2400m_dev_bootstrap()], __i2400m_dev_start() will retry a number of
times. However, for those retries to be able to accomplish anything,
the device's bootrom has to be reinitialized.

Thus, on the retry path, pass the I2400M_MAC_REINIT to the firmware
load code.

Signed-off-by: Cindy H Kao <cindy.h.kao@intel.com>
---

diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 8d8628e5af44..2a093c5768cc 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -454,7 +454,7 @@ error_rx_setup:
 error_tx_setup:
 error_bootstrap:
 	if (result == -ERESTARTSYS && times-- > 0) {
-		flags = I2400M_BRI_SOFT;
+		flags = I2400M_BRI_SOFT|I2400M_BRI_MAC_REINIT;
 		goto retry;
 	}
 	d_fnend(3, dev, "(net_dev %p [i2400m %p]) = %d\n",