mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-11 13:27:06 +09:00
one of the alsa patches landed between rc5 and rc6
nuke it. svn path=/dists/trunk/linux-2.6/; revision=17808
This commit is contained in:
1
debian/changelog
vendored
1
debian/changelog
vendored
@@ -16,7 +16,6 @@ linux-2.6 (3.0.0~rc6-1~experimental.1) UNRELEASED; urgency=low
|
||||
* m68k/atari: Reserve some ST-RAM early on for device buffer use.
|
||||
* ALSA: hda - Handle -1 as invalid position, too
|
||||
* ALSA: hda - Judge playback stream from stream id in azx_via_get_position()
|
||||
* ALSA: HDMI - fix ELD monitor name length
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* [x86] Enable SCSI_ISCI as module
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From f5b2d0ef631bb0647ae8ed1752d2127b8fb6da70 Mon Sep 17 00:00:00 2001
|
||||
From: Wu Fengguang <fengguang.wu@intel.com>
|
||||
Date: Wed, 29 Jun 2011 14:26:07 +0800
|
||||
Subject: [PATCH] ALSA: HDMI - fix ELD monitor name length
|
||||
|
||||
I noticed that the last character of the ELD monitor name is lost,
|
||||
this fixes the issue.
|
||||
|
||||
This fix should be confirming to the HDA spec, and works together with
|
||||
the DRM part of the ELD patch.
|
||||
|
||||
The HDA spec does not mention that Monitor_Name_String is an '\0'
|
||||
ending string, and it allows NML to be 1, which is only valid when MNL
|
||||
does not count the possible ending '\0'.
|
||||
|
||||
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
sound/pci/hda/hda_eld.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
|
||||
index b05f7be..e3e8531 100644
|
||||
--- a/sound/pci/hda/hda_eld.c
|
||||
+++ b/sound/pci/hda/hda_eld.c
|
||||
@@ -294,7 +294,7 @@ static int hdmi_update_eld(struct hdmi_eld *e,
|
||||
snd_printd(KERN_INFO "HDMI: out of range MNL %d\n", mnl);
|
||||
goto out_fail;
|
||||
} else
|
||||
- strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl);
|
||||
+ strlcpy(e->monitor_name, buf + ELD_FIXED_BYTES, mnl + 1);
|
||||
|
||||
for (i = 0; i < e->sad_count; i++) {
|
||||
if (ELD_FIXED_BYTES + mnl + 3 * (i + 1) > size) {
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
1
debian/patches/series/base
vendored
1
debian/patches/series/base
vendored
@@ -50,4 +50,3 @@
|
||||
+ bugfix/all/m68k-atari-Reserve-some-ST-RAM-early-on-for-device-b.patch
|
||||
+ bugfix/all/ALSA-hda-Handle-1-as-invalid-position-too.patch
|
||||
+ bugfix/all/ALSA-hda-Judge-playback-stream-from-stream-id-in-azx.patch
|
||||
+ bugfix/all/ALSA-HDMI-fix-ELD-monitor-name-length.patch
|
||||
|
||||
Reference in New Issue
Block a user