ALSA: hda: intel-nhlt: Print errors in intel_nhlt_ssp_device_type()
PATCH 1/1 ALSA: hda: intel-nhlt: Print errors in intel_nhlt_ssp_device_type()
Do not fail silently when the intel_nhlt_ssp_device_type() fails as it can be for two reasons:
The NHLT table is missing or the SSP instance is missing from the table.
Signed-off-by Peter Ujfalusi <[email protected]>
Reviewed-by Bard Liao <[email protected]>
Reviewed-by Ranjani Sridharan <[email protected]>
--- sound/hda/intel-nhlt.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
sound/hda/intel-nhlt.c +18 -1
@@ -350,8 +350,11 @@ int intel_nhlt_ssp_device_type(struct device *dev, struct nhlt_acpi_table *nhlt,struct nhlt_endpoint *epnt;int i; -if (!nhlt) +if (!nhlt) { +dev_err (dev,"%s: NHLT table is missing (query for SSP%d)\n" , + __func__, virtual_bus_id);return -EINVAL ; + } epnt = (struct nhlt_endpoint *)nhlt->desc;for (i =0 ; i < nhlt->endpoint_count; i++) {
@@ -366,6 +369,20 @@ int intel_nhlt_ssp_device_type(struct device *dev, struct nhlt_acpi_table *nhlt, epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length); } +dev_err (dev,"%s: No match for SSP%d in NHLT table\n" , __func__, + virtual_bus_id); + +dev_dbg (dev,"Available endpoints:\n" ); + epnt = (struct nhlt_endpoint *)nhlt->desc; +for (i =0 ; i < nhlt->endpoint_count; i++) { +dev_dbg (dev, +"%d: link_type: %d, vbus_id: %d, dir: %d, dev_type: %d\n" , + i, epnt->linktype, epnt->virtual_bus_id, + epnt->direction, epnt->device_type); + + epnt = (struct nhlt_endpoint *)((u8 *)epnt + epnt->length); + } +return -EINVAL ; }EXPORT_SYMBOL (intel_nhlt_ssp_device_type);
Signature · 1 line
2.49.0
Takashi Iwai
AppliedQuoted 8 lines · Peter Ujfalusi
Do not fail silently when the
intel_nhlt_ssp_device_type()fails as it can be for two reasons:
The NHLT table is missing or the SSP instance is missing from the table.Signed-off-by Peter Ujfalusi <[email protected]>Reviewed-by Bard Liao <[email protected]>Reviewed-by Ranjani Sridharan <[email protected]>
Thanks, applied now to for-next branch.
Takashi