diff options
| author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-05 09:31:26 +0800 |
|---|---|---|
| committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-11 03:30:25 -0700 |
| commit | 6e053d6c79b3c1c9f6efc6563a811023c41be86a (patch) | |
| tree | 579cb648734e1283873d7f4f7195c231f5062197 | |
| parent | 1c0b2dd75772cbce0aef8886b7f38313542216de (diff) | |
| download | linux-6e053d6c79b3c1c9f6efc6563a811023c41be86a.tar.gz linux-6e053d6c79b3c1c9f6efc6563a811023c41be86a.tar.bz2 linux-6e053d6c79b3c1c9f6efc6563a811023c41be86a.zip | |
wimax/i2400m: don't reset device when bootrom init retries are exceeded
When i2400m_bootrom_init() fails to put the device into a state of
being ready to accept firmware, the driver was currently trying to
reset it if it failed to do so. This is not too useful; as part of
trying to put the device in the right state a few resets have already
been tried.
At this point, things are probably fried out and an extra reset might
do more harm than good (for example causing reseting of other
functions in the same composite device).
So it is left up to the callers to determine the error path to take
(at the end this is always i2400m_setup(), who depending on how many
retries are left, might give up on the device).
From a fix by Cindy H. Kao.
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
| -rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 349344ad9b61..e81750e54452 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c @@ -696,8 +696,7 @@ error_dev_gone: return result; error_timeout: - dev_err(dev, "Timed out waiting for reboot ack, resetting\n"); - i2400m->bus_reset(i2400m, I2400M_RT_BUS); + dev_err(dev, "Timed out waiting for reboot ack\n"); result = -ETIMEDOUT; goto exit_timeout; } |