diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:28:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-06 12:28:08 +0200 |
| commit | c2913b140f901a705809f8b6c83998cf8147f848 (patch) | |
| tree | 53686878548921b83e8d9db437c4437140561980 /include/sound | |
| parent | 5d78e1c2b7f4be00bbe62141603a631dc7812f35 (diff) | |
| parent | 30c21734d853dae99d05a5295a59b7e26ccd5135 (diff) | |
Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.3
A relatively large batch of mostly unremarkable fixes here, a couple of
small core fixes for fairly obscure issues, more comment/email updates
with no code impact than usual and a bunch of small driver fixes.
The support for new sample rates in the max98373 driver is a fix for the
fact that the driver declared support for those rates but would in fact
return an error if these rates were selected.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/simple_card_utils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 954563ee2277..985a5f583de4 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -141,6 +141,10 @@ inline void asoc_simple_debug_dai(struct asoc_simple_priv *priv, { struct device *dev = simple_priv_to_dev(priv); + /* dai might be NULL */ + if (!dai) + return; + if (dai->name) dev_dbg(dev, "%s dai name = %s\n", name, dai->name); |