diff options
author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-02 21:45:55 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-06-11 06:30:23 -0400 |
commit | b4013f91cdda10f3f15530914f3c7f39738b0b50 (patch) | |
tree | 8dc5ab721c3f2028de4e2372436f76bb059a9fff /drivers/net/wimax/i2400m/fw.c | |
parent | 59063afa0afabc68d2b6ca0d106da9165e1c7d39 (diff) |
wimax/i2400m: if a device reboot happens during probe, handle it
When a device reboot happens when we are under probe, with init_mutex
taken, make sure we can recover. Have dev_reset_handle set boot mode
and i2400m_msg_to_dev() will see it and fail gracefully instead of
timing out.
Found and diagnosed by Cindy H. Kao.
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Diffstat (limited to 'drivers/net/wimax/i2400m/fw.c')
-rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 26924f17f19d..01c926ed309e 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c | |||
@@ -985,6 +985,7 @@ int i2400m_fw_dnload(struct i2400m *i2400m, const struct i2400m_bcf_hdr *bcf, | |||
985 | d_fnstart(5, dev, "(i2400m %p bcf %p size %zu)\n", | 985 | d_fnstart(5, dev, "(i2400m %p bcf %p size %zu)\n", |
986 | i2400m, bcf, bcf_size); | 986 | i2400m, bcf, bcf_size); |
987 | i2400m->boot_mode = 1; | 987 | i2400m->boot_mode = 1; |
988 | wmb(); /* Make sure other readers see it */ | ||
988 | hw_reboot: | 989 | hw_reboot: |
989 | if (count-- == 0) { | 990 | if (count-- == 0) { |
990 | ret = -ERESTARTSYS; | 991 | ret = -ERESTARTSYS; |
@@ -1033,6 +1034,7 @@ hw_reboot: | |||
1033 | d_printf(2, dev, "fw %s successfully uploaded\n", | 1034 | d_printf(2, dev, "fw %s successfully uploaded\n", |
1034 | i2400m->fw_name); | 1035 | i2400m->fw_name); |
1035 | i2400m->boot_mode = 0; | 1036 | i2400m->boot_mode = 0; |
1037 | wmb(); /* Make sure i2400m_msg_to_dev() sees boot_mode */ | ||
1036 | error_dnload_finalize: | 1038 | error_dnload_finalize: |
1037 | error_dnload_bcf: | 1039 | error_dnload_bcf: |
1038 | error_dnload_init: | 1040 | error_dnload_init: |