ASoC: Intel: bxt_rt298: Fix kernel ops due to COMP_DUMMY change
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Mon, 8 Jan 2024 09:48:42 +0000 (11:48 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 8 Jan 2024 12:29:45 +0000 (12:29 +0000)
The change to avoid dummy components will leave the component name and
dai_name NULL which will cause NULL dereference when trying to access to
it in the machine driver when applying fixups.

Link: https://github.com/thesofproject/linux/pull/4759#issuecomment-1878641868
Fixes: 13f58267cda3 ("ASoC: soc.h: don't create dummy Component via COMP_DUMMY()")
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240108094842.28782-3-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bxt_rt298.c

index 4631106f2a2823d4dfebd7f4e7f372cf7d5e2732..c0eb65c14aa97b4b9d14163bf4e957dcaedbea69 100644 (file)
@@ -604,7 +604,8 @@ static int broxton_audio_probe(struct platform_device *pdev)
        int i;
 
        for (i = 0; i < ARRAY_SIZE(broxton_rt298_dais); i++) {
-               if (!strncmp(card->dai_link[i].codecs->name, "i2c-INT343A:00",
+               if (card->dai_link[i].codecs->name &&
+                   !strncmp(card->dai_link[i].codecs->name, "i2c-INT343A:00",
                             I2C_NAME_SIZE)) {
                        if (!strncmp(card->name, "broxton-rt298",
                                     PLATFORM_NAME_SIZE)) {