projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
[deliverable/linux.git]
/
sound
/
pci
/
hda
/
patch_hdmi.c
diff --git
a/sound/pci/hda/patch_hdmi.c
b/sound/pci/hda/patch_hdmi.c
index c83c1a8d9742b8f2da261f416561111cb64bd662..1483f85999ecd82d1b9215f5a634011819fd368a 100644
(file)
--- 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);
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));
mutex_lock(&per_pin->lock);
per_pin->chmap_set = true;
memcpy(per_pin->chmap, chmap, ARRAY_SIZE(per_pin->chmap));
@@
-2230,6
+2232,7
@@
static void intel_pin_eld_notify(void *audio_ptr, int port)
if (atomic_read(&(codec)->core.in_pm))
return;
if (atomic_read(&(codec)->core.in_pm))
return;
+ snd_hdac_i915_set_bclk(&codec->bus->core);
check_presence_and_report(codec, pin_nid);
}
check_presence_and_report(codec, pin_nid);
}
This page took
0.024187 seconds
and
5
git commands to generate.