[PATCH] [UBUNTU:sound/pci/hda/] Don't fail loading if modem can't be initialised

From 6929a4cd4168e92b788c1dd03584fa42cdef5210 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 10 Oct 2006 15:23:10 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] Don't fail loading if modem can't be 
initialised

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
                57960a38c4ac 
[http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=57960a38c4acc4bf8d44c660657ec6637d42ce87;style=raw]

This patch from Takashi Iwai prevents the entire codec from failing
to load when the modem can't be initialised:

"Some modem codec seem to fail in the initialization, and this
stopped loading of the whole module although the audio is OK.
Since it's usually a non-fatal issue, the driver tries to proceed
to initialize now."

This commit is applicable to both Dapper and Edgy linux-source.

Signed-off-by: Daniel T Chen <crimsun@xxxxxxxxxx>
---
 sound/pci/hda/patch_si3054.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index afd5b69..260731e 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -243,7 +243,8 @@ static int si3054_init(struct hda_codec 
 
        if((val&SI3054_MEI_READY) != SI3054_MEI_READY) {
                snd_printk(KERN_ERR "si3054: cannot initialize. EXT MID = 
%04x\n", val);
-               return -EACCES;
+               /* let's pray that this is no fatal error */
+               /* return -EACCES; */
        }
 
        SET_REG(codec, SI3054_GPIO_POLARITY, 0xffff);
-- 
1.4.1


-- 
Daniel T. Chen            crimsun@xxxxxxxxxx
GPG key:  0xC88ABDA3

pgpEsG2t6ZbWa.pgp
Description: PGP signature