[PATCH] [UBUNTU:sound/pci/] Fix possible OOPS with ALI5455 SPDIF-in

[crimsun at fungus.sh.nu]

Subject: [PATCH] [UBUNTU:sound/pci/] Fix possible OOPS with ALI5455 SPDIF-in

UpstreamStatus: Added in upstream hg changeset 9d88e5e3f42f [0]

This commit from Takashi Iwai prevents a possible OOPS if the SPDIF-in
is used on an ALI5455 by disabling the broken "functionality."

[0] http://sourceforge.net/mailarchive/forum.php?thread_id=10200068&forum_id=33141

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/intel8x0.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

f85189bf9340928e76578111962ccba053f615e4
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index f4e3801..e378093 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -1252,6 +1252,7 @@ static int snd_intel8x0_ali_ac97spdifout
 	return 0;
 }
 
+#if 0 // NYI
 static int snd_intel8x0_ali_spdifin_open(snd_pcm_substream_t * substream)
 {
 	intel8x0_t *chip = snd_pcm_substream_chip(substream);
@@ -1267,7 +1268,6 @@ static int snd_intel8x0_ali_spdifin_clos
 	return 0;
 }
 
-#if 0 // NYI
 static int snd_intel8x0_ali_spdifout_open(snd_pcm_substream_t * substream)
 {
 	intel8x0_t *chip = snd_pcm_substream_chip(substream);
@@ -1394,6 +1394,7 @@ static snd_pcm_ops_t snd_intel8x0_ali_ac
 	.pointer =	snd_intel8x0_pcm_pointer,
 };
 
+#if 0 // NYI
 static snd_pcm_ops_t snd_intel8x0_ali_spdifin_ops = {
 	.open =		snd_intel8x0_ali_spdifin_open,
 	.close =	snd_intel8x0_ali_spdifin_close,
@@ -1405,7 +1406,6 @@ static snd_pcm_ops_t snd_intel8x0_ali_sp
 	.pointer =	snd_intel8x0_pcm_pointer,
 };
 
-#if 0 // NYI
 static snd_pcm_ops_t snd_intel8x0_ali_spdifout_ops = {
 	.open =		snd_intel8x0_ali_spdifout_open,
 	.close =	snd_intel8x0_ali_spdifout_close,
@@ -1539,7 +1539,7 @@ static struct ich_pcm_table ali_pcms[] _
 	{
 		.suffix = "IEC958",
 		.playback_ops = &snd_intel8x0_ali_ac97spdifout_ops,
-		.capture_ops = &snd_intel8x0_ali_spdifin_ops,
+		/* .capture_ops = &snd_intel8x0_ali_spdifin_ops, */
 		.prealloc_size = 64 * 1024,
 		.prealloc_max_size = 128 * 1024,
 		.ac97_idx = ALID_AC97SPDIFOUT,
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060514/a79f06de/attachment.sig>