diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-01-23 00:41:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-23 11:17:56 +0000 |
| commit | 971da24c48a9447fb7a3c7805812fd5f443ca008 (patch) | |
| tree | 00fb0782e837b6bc47176814918bab0df25f0294 /sound | |
| parent | 031734b7d6532633d0cde73475c30646bf37cd6d (diff) | |
| download | op-kernel-dev-971da24c48a9447fb7a3c7805812fd5f443ca008.zip op-kernel-dev-971da24c48a9447fb7a3c7805812fd5f443ca008.tar.gz | |
ASoC: soc-core: snd_soc_rtdcom_lookup() cares component driver name
snd_soc_rtdcom_lookup() look up component by uisng driver name.
Then, it uses component->driver->name.
Some driver might doesn't have it, thus it should care NULL pointer.
This patch solve this issue.
Reported-by: Mukunda,Vijendar <vijendar.mukunda@amd.com>
Reported-by: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Mukunda,Vijendar <vijendar.mukunda@amd.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9b79c21..52b2e04 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -590,9 +590,17 @@ struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd, { struct snd_soc_rtdcom_list *rtdcom; + if (!driver_name) + return NULL; + for_each_rtdcom(rtd, rtdcom) { - if ((rtdcom->component->driver->name == driver_name) || - strcmp(rtdcom->component->driver->name, driver_name) == 0) + const char *component_name = rtdcom->component->driver->name; + + if (!component_name) + continue; + + if ((component_name == driver_name) || + strcmp(component_name, driver_name) == 0) return rtdcom->component; } |
