diff options
| author |   Libin Yang <libin.yang@linux.intel.com> | 2016-04-18 09:16:28 +0800 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2016-04-18 07:27:08 +0200 |
| commit | ed0739b577f2ddd53835f1e20d014fccab195c42 (patch) | |
| tree | f10b5731389166f632eb6f5e7cd01c8c670f66b6 /sound | |
| parent | ALSA: hda - Don't trust the reported actual power state (diff) | |
| download | linux-dev-ed0739b577f2ddd53835f1e20d014fccab195c42.tar.xz linux-dev-ed0739b577f2ddd53835f1e20d014fccab195c42.zip | |
ALSA - hda: hdmi check NULL pointer in hdmi_set_chmap
Make sure per_pin is not NULL before using it.
Fixes: 9b3dc8aa3fb1 ('ALSA: hda - Register chmap obj as priv data instead of codec')
Signed-off-by: Libin Yang <libin.yang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index c83c1a8d9742..40933aa33afe 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1858,6 +1858,8 @@ static void hdmi_set_chmap(struct hdac_device *hdac, int pcm_idx, struct hdmi_spec *spec = codec->spec; struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx); + if (!per_pin) + return; mutex_lock(&per_pin->lock); per_pin->chmap_set = true; memcpy(per_pin->chmap, chmap, ARRAY_SIZE(per_pin->chmap)); |