aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCindy H Kao <cindy.h.kao@intel.com>2009-06-10 16:52:10 -0700
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-06-11 03:30:26 -0700
commit8b5b30ee7ddc989b59ce05dcf2d024a819dc8040 (patch)
tree49b564e60706973bfeac592cb00c76f3c0ce102c
parent16820c166d3ad5973d388b5aa70ee7e535386657 (diff)
downloadkernel_samsung_aries-8b5b30ee7ddc989b59ce05dcf2d024a819dc8040.zip
kernel_samsung_aries-8b5b30ee7ddc989b59ce05dcf2d024a819dc8040.tar.gz
kernel_samsung_aries-8b5b30ee7ddc989b59ce05dcf2d024a819dc8040.tar.bz2
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>
-rw-r--r--drivers/net/wimax/i2400m/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 8d8628e..2a093c5 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",