diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-30 17:05:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-30 17:05:02 -0700 |
| commit | 936dbcc3f2fc7314f3c1645fc39ea51117f6d73b (patch) | |
| tree | 99fa265ad3e3445f95760c2b3ade3ef08f338a60 /sound/pci/hda/patch_hdmi.c | |
| parent | d9eda0fae1394ea1e1c59c94d4a120ad9c06e64a (diff) | |
| parent | fb615499f0ad28ed74201c1cdfddf9e64e205424 (diff) | |
| download | linux-936dbcc3f2fc7314f3c1645fc39ea51117f6d73b.tar.gz linux-936dbcc3f2fc7314f3c1645fc39ea51117f6d73b.tar.xz | |
Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This contains two Oops fixes (opti9xx and HD-audio) and a simple fixup
for an Acer laptop. All marked as stable patches"
* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: opti9xx: Fix conflicting driver object name
ALSA: hda - Fix NULL dereference with CONFIG_SND_DYNAMIC_MINORS=n
ALSA: hda - Add inverted digital mic fixup for Acer Aspire One
Diffstat (limited to 'sound/pci/hda/patch_hdmi.c')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 030ca8652a1c..9f3586276871 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1781,6 +1781,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) struct snd_pcm_chmap *chmap; struct snd_kcontrol *kctl; int i; + + if (!codec->pcm_info[pin_idx].pcm) + break; err = snd_pcm_add_chmap_ctls(codec->pcm_info[pin_idx].pcm, SNDRV_PCM_STREAM_PLAYBACK, NULL, 0, pin_idx, &chmap); |