diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
| commit | a143f427f3e7c6d80bc1d288334706a1f8237f5f (patch) | |
| tree | 59e96413cf2013afb70bfaaca5f89937d9d7ac20 /sound/pci/hda/hda_codec.c | |
| parent | d9e292d3ea94ab21f028108527a908e415e856ef (diff) | |
| parent | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-15.11-rtlsk-v4.1-15.10-rtlsk-v4.1-15.09-rt
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 5645481af3d9..36e8f1236637 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3259,7 +3259,7 @@ static int add_std_chmaps(struct hda_codec *codec) struct snd_pcm_chmap *chmap; const struct snd_pcm_chmap_elem *elem; - if (!pcm || pcm->own_chmap || + if (!pcm || !pcm->pcm || pcm->own_chmap || !hinfo->substreams) continue; elem = hinfo->chmap ? hinfo->chmap : snd_pcm_std_chmaps; |