Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

[pandora-kernel.git] / sound / pci / echoaudio / echoaudio_dsp.c

diff --git a/sound/pci/echoaudio/echoaudio_dsp.c b/sound/pci/echoaudio/echoaudio_dsp.c
index 42afa83..e6c1007 100644 (file)
--- a/sound/pci/echoaudio/echoaudio_dsp.c
+++ b/sound/pci/echoaudio/echoaudio_dsp.c
@@ -43,11 +43,11 @@ static int wait_handshake(struct echoaudio *chip)
 {
        int i;
 
-       /* Wait up to 10ms for the handshake from the DSP */
+       /* Wait up to 20ms for the handshake from the DSP */
        for (i = 0; i < HANDSHAKE_TIMEOUT; i++) {
                /* Look for the handshake value */
+               barrier();
                if (chip->comm_page->handshake) {
-                       /*if (i)  DE_ACT(("Handshake time: %d\n", i));*/
                        return 0;
                }
                udelay(1);