Commit 51bdb9fa authored by Ionela Voinescu's avatar Ionela Voinescu
Browse files

Revert "usb: renesas-xhci: Fix handling of unknown ROM state"

This reverts commit d143825b.
parent 58b4aa08
...@@ -207,8 +207,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev) ...@@ -207,8 +207,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev)
return 0; return 0;
case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */ case RENESAS_ROM_STATUS_NO_RESULT: /* No result yet */
dev_dbg(&pdev->dev, "Unknown ROM status ...\n"); return 0;
break;
case RENESAS_ROM_STATUS_ERROR: /* Error State */ case RENESAS_ROM_STATUS_ERROR: /* Error State */
default: /* All other states are marked as "Reserved states" */ default: /* All other states are marked as "Reserved states" */
...@@ -225,12 +224,13 @@ static int renesas_fw_check_running(struct pci_dev *pdev) ...@@ -225,12 +224,13 @@ static int renesas_fw_check_running(struct pci_dev *pdev)
u8 fw_state; u8 fw_state;
int err; int err;
/* /* Check if device has ROM and loaded, if so skip everything */
* Only if device has ROM and loaded FW we can skip loading and err = renesas_check_rom(pdev);
* return success. Otherwise (even unknown state), attempt to load FW. if (err) { /* we have rom */
*/ err = renesas_check_rom_state(pdev);
if (renesas_check_rom(pdev) && !renesas_check_rom_state(pdev)) if (!err)
return 0; return err;
}
/* /*
* Test if the device is actually needing the firmware. As most * Test if the device is actually needing the firmware. As most
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment