diff options
| author | Takashi Iwai | 2015-08-25 08:01:41 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-08-25 08:01:41 +0200 |
| commit | c4a91e173ac671e81ea6fc9d0951b7527e2ae13d (patch) | |
| tree | 69c05b6944911c325db3f9257f325797e81a27bb /sound/pci/hda/hda_codec.c | |
| parent | 4308c9b083fbab1a442e68a03de099841791df27 (diff) | |
| parent | c7cd0ef66aade29e37ee08821a0e195ee776c6e6 (diff) | |
Merge branch 'for-linus' into for-next
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 00c9a42af656..792948418cf0 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3102,7 +3102,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; |