Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
linux-arm
linux-power
Commits
51bdb9fa
Commit
51bdb9fa
authored
Aug 02, 2021
by
Ionela Voinescu
Browse files
Revert "usb: renesas-xhci: Fix handling of unknown ROM state"
This reverts commit
d143825b
.
parent
58b4aa08
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/usb/host/xhci-pci-renesas.c
View file @
51bdb9fa
...
...
@@ -207,8 +207,7 @@ static int renesas_check_rom_state(struct pci_dev *pdev)
return
0
;
case
RENESAS_ROM_STATUS_NO_RESULT
:
/* No result yet */
dev_dbg
(
&
pdev
->
dev
,
"Unknown ROM status ...
\n
"
);
break
;
return
0
;
case
RENESAS_ROM_STATUS_ERROR
:
/* Error State */
default:
/* All other states are marked as "Reserved states" */
...
...
@@ -225,12 +224,13 @@ static int renesas_fw_check_running(struct pci_dev *pdev)
u8
fw_state
;
int
err
;
/*
* Only if device has ROM and loaded FW we can skip loading and
* return success. Otherwise (even unknown state), attempt to load FW.
*/
if
(
renesas_check_rom
(
pdev
)
&&
!
renesas_check_rom_state
(
pdev
))
return
0
;
/* Check if device has ROM and loaded, if so skip everything */
err
=
renesas_check_rom
(
pdev
);
if
(
err
)
{
/* we have rom */
err
=
renesas_check_rom_state
(
pdev
);
if
(
!
err
)
return
err
;
}
/*
* Test if the device is actually needing the firmware. As most
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment