diff options
| -rw-r--r-- | src/soc/intel/cannonlake/fsp_params.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/meteorlake/fsp_params.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/fsp_params.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index bd3d1495fe..df5fcee36f 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -531,7 +531,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) /* Enable CNVi Wifi if enabled in device tree */ #if CONFIG(SOC_INTEL_COMETLAKE) struct device *port = NULL; - struct drivers_usb_acpi_config *usb_cfg; + struct drivers_usb_acpi_config *usb_cfg = NULL; bool usb_audio_offload = false; /* Search through the devicetree for matching USB devices */ @@ -564,7 +564,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) if (s_cfg->CnviBtAudioOffload && !usb_audio_offload) { printk(BIOS_WARNING, "CNVi BT Audio offload enabled but not in USB driver.\n"); } - if (!s_cfg->CnviBtAudioOffload && usb_audio_offload) { + if (!s_cfg->CnviBtAudioOffload && usb_cfg && usb_audio_offload) { printk(BIOS_ERR, "USB BT Audio offload enabled but CNVi BT offload disabled\n"); usb_cfg->cnvi_bt_audio_offload = 0; } diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index c2770e630c..0ae36e6997 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -578,7 +578,7 @@ static void fill_fsps_cnvi_params(FSP_S_CONFIG *s_cfg, const struct soc_intel_meteorlake_config *config) { struct device *port = NULL; - struct drivers_usb_acpi_config *usb_cfg; + struct drivers_usb_acpi_config *usb_cfg = NULL; bool usb_audio_offload = false; /* Search through the devicetree for matching USB devices */ @@ -615,7 +615,7 @@ static void fill_fsps_cnvi_params(FSP_S_CONFIG *s_cfg, if (s_cfg->CnviBtAudioOffload && !usb_audio_offload) { printk(BIOS_WARNING, "CNVi BT Audio offload enabled but not in USB driver\n"); } - if (!s_cfg->CnviBtAudioOffload && usb_audio_offload) { + if (!s_cfg->CnviBtAudioOffload && usb_cfg && usb_audio_offload) { printk(BIOS_ERR, "USB BT Audio offload enabled but CNVi BT offload disabled\n"); usb_cfg->cnvi_bt_audio_offload = 0; } diff --git a/src/soc/intel/tigerlake/fsp_params.c b/src/soc/intel/tigerlake/fsp_params.c index 9706ac6d62..fa95e479b6 100644 --- a/src/soc/intel/tigerlake/fsp_params.c +++ b/src/soc/intel/tigerlake/fsp_params.c @@ -495,7 +495,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) /* CNVi */ struct device *port = NULL; - struct drivers_usb_acpi_config *usb_cfg; + struct drivers_usb_acpi_config *usb_cfg = NULL; bool usb_audio_offload = false; /* Search through the devicetree for matching USB devices */ @@ -528,7 +528,7 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) if (params->CnviBtAudioOffload && !usb_audio_offload) { printk(BIOS_WARNING, "CNVi BT Audio offload enabled but not in USB driver.\n"); } - if (!params->CnviBtAudioOffload && usb_audio_offload) { + if (!params->CnviBtAudioOffload && usb_cfg && usb_audio_offload) { printk(BIOS_ERR, "USB BT Audio offload enabled but CNVi BT offload disabled\n"); usb_cfg->cnvi_bt_audio_offload = 0; } |