diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:26 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:26 -0500 |
| commit | 86b3aa390b4b9925f16a21b98441fd7abdb9fff2 (patch) | |
| tree | 9eb9d429a88d2301667198e30842502556b715f2 /sound/pci/riptide/riptide.c | |
| parent | e4456e71618ec2c98084c15824d93e997955b60c (diff) | |
| parent | ebef7cfc81942686a994ca6239b195040f5d1e4d (diff) | |
Merge branch 'topic/ca0106' into to-push
Diffstat (limited to 'sound/pci/riptide/riptide.c')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index e9f0706ed3e4..d0ccfc68c522 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."); | |||
| 172 | 172 | ||
| 173 | #define MAX_WRITE_RETRY 10 /* cmd interface limits */ | 173 | #define MAX_WRITE_RETRY 10 /* cmd interface limits */ |
| 174 | #define MAX_ERROR_COUNT 10 | 174 | #define MAX_ERROR_COUNT 10 |
| 175 | #define CMDIF_TIMEOUT 500000 | 175 | #define CMDIF_TIMEOUT 50000 |
| 176 | #define RESET_TRIES 5 | 176 | #define RESET_TRIES 5 |
| 177 | 177 | ||
| 178 | #define READ_PORT_ULONG(p) inl((unsigned long)&(p)) | 178 | #define READ_PORT_ULONG(p) inl((unsigned long)&(p)) |