summaryrefslogtreecommitdiffstats
path: root/sound/pci/riptide
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:26 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-25 11:40:26 +0100
commit86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (patch)
tree9eb9d429a88d2301667198e30842502556b715f2 /sound/pci/riptide
parente4456e71618ec2c98084c15824d93e997955b60c (diff)
parentebef7cfc81942686a994ca6239b195040f5d1e4d (diff)
downloadop-kernel-dev-86b3aa390b4b9925f16a21b98441fd7abdb9fff2.zip
op-kernel-dev-86b3aa390b4b9925f16a21b98441fd7abdb9fff2.tar.gz
Merge branch 'topic/ca0106' into to-push
Diffstat (limited to 'sound/pci/riptide')
-rw-r--r--sound/pci/riptide/riptide.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index e9f0706..d0ccfc6 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -172,7 +172,7 @@ MODULE_PARM_DESC(opl3_port, "OPL3 port # for Riptide driver.");
#define MAX_WRITE_RETRY 10 /* cmd interface limits */
#define MAX_ERROR_COUNT 10
-#define CMDIF_TIMEOUT 500000
+#define CMDIF_TIMEOUT 50000
#define RESET_TRIES 5
#define READ_PORT_ULONG(p) inl((unsigned long)&(p))
OpenPOWER on IntegriCloud