Some formatting fixes, as well as a fwe mrv_reg_read32 returnvalue changes Signed-off-by: John Daiker --- drivers/net/wireless/mrv8k/mrv8k.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/mrv8k/mrv8k.c b/drivers/net/wireless/mrv8k/mrv8k.c index a86ea9f..88497a1 100644 --- a/drivers/net/wireless/mrv8k/mrv8k.c +++ b/drivers/net/wireless/mrv8k/mrv8k.c @@ -241,8 +241,9 @@ static int mrv_upload_fw(struct mrv_priv *priv) _mrv_send_cmd(priv, MRV_HWMEM_CMD_BOOT); - /* the boot code is stupid enought that it does not report any status when it - * loads correctly and become alive. Wait 1 second..*/ + /* The boot code is stupid enough that it does not report any status + * when it loads correctly and become alive. Wait 1 second... + */ msleep(1000); err = request_firmware(&img, FW_FIRMWARE_FILENAME, &priv->pdev->dev); @@ -260,12 +261,15 @@ static int mrv_upload_fw(struct mrv_priv *priv) memcpy(cmd_data, img->data + i, 256); mrv_send_cmd(priv); for (j = 0; j < 500; j++) { - if (mrv_reg_read32(priv, MRV_REG_STATUS) == 5) - break; + if (mrv_reg_read32(priv, MRV_REG_STATUS) == 0x5) + break; mdelay(1); } + /* We waited for 500 msecs and the card never went to the + * magical 'Loading firmware' state + */ if (j == 500) { - printk(KERN_ERR"Boot FW has failed to transfer real FW\n"); + printk(KERN_ERR"Boot Firmware has failed to transfer a real Firmware\n"); return -2; } } @@ -278,12 +282,15 @@ static int mrv_upload_fw(struct mrv_priv *priv) memcpy(cmd_data, img->data + i, img->size - i); mrv_send_cmd(priv); for (j = 0; j < 500; j++) { - if (mrv_reg_read32(priv, MRV_REG_STATUS) == 5) - break; + if (mrv_reg_read32(priv, MRV_REG_STATUS) == 0x5) + break; mdelay(1); } + /* We waited for 500 msecs and the card never transfered the + * last portion of the firmware... return an error + */ if (j == 500) { - printk(KERN_ERR"Boot FW has failed to transfer last real FW chunk\n"); + printk(KERN_ERR"Boot Firmware has failed to transfer the last real Firmware chunk\n"); return -2; } }