x86: queensbay: Return directly if IGD / SDVO were already disabled

Initialize 'igd' and 'sdvo' to NULL so that we just need to test
them against NULL later, to be compatible with that case that IGD
and SDVO devices were already in disabled state.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2021-08-02 15:05:15 +08:00
parent 33e4ab31a9
commit c71d5fb717

View File

@ -18,19 +18,17 @@
static int __maybe_unused disable_igd(void)
{
struct udevice *igd, *sdvo;
struct udevice *igd = NULL;
struct udevice *sdvo = NULL;
int ret;
ret = dm_pci_bus_find_bdf(TNC_IGD, &igd);
if (ret)
return ret;
if (!igd)
return 0;
ret = dm_pci_bus_find_bdf(TNC_SDVO, &sdvo);
if (ret)
return ret;
if (!sdvo)
/*
* In case the IGD and SDVO devices were already in disabled state,
* we should return and not proceed any further.
*/
dm_pci_bus_find_bdf(TNC_IGD, &igd);
dm_pci_bus_find_bdf(TNC_SDVO, &sdvo);
if (!igd || !sdvo)
return 0;
/*