CHROMIUM: ALSA: hda/ca0132 - Longer chip io timeout.

According to Creative there are some extreme circumstances where the
DSP can take > 1second to respond to a command.  I have asked them to
investigate further and eliminate this possibility.  Until the DSP
side can be fixed, lengthen the timeout to 2 seconds so the system
avoid resuming without audio.

BUG=chrome-os-partner:14465
TEST=suspend/resume for 4k cycles, never see DSP load failure.

Change-Id: If6f227fe31421361690be4301f513b17f79692a7
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39140
Reviewed-by: Hsinyu Chao <hychao@chromium.org>
Reviewed-by: Chih-Chung Chang <chihchung@chromium.org>

diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index a503c9c06e55a074e3ea37f58d12ec947c7f30fc..b4312514aaa0fd162a279a0058a1f2978730573b 100644 (file)
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -809,7 +809,7 @@ static int chipio_send(struct hda_codec *codec,
                       u32 data)
 {
        unsigned int res;
-       unsigned long timeout = jiffies + msecs_to_jiffies(1000);
+       unsigned long timeout = jiffies + msecs_to_jiffies(2000);
 
        /* send bits of data specified by reg */
        do {