diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-22 17:03:52 +0200 |
| commit | b61eaa924c320821469caa0cd2bf89e7a1ec8bd0 (patch) | |
| tree | a508d414fe278685c2010ef7cb454d25ad6c61e7 /sound/pci | |
| parent | 11a93fd9402ce47e4dc652837b1374ecdb750aba (diff) | |
| parent | 115551d98e4c05bb982bd940f08a489fa9b0a4a1 (diff) | |
| download | kernel-crypto-b61eaa924c320821469caa0cd2bf89e7a1ec8bd0.tar.gz kernel-crypto-b61eaa924c320821469caa0cd2bf89e7a1ec8bd0.tar.xz kernel-crypto-b61eaa924c320821469caa0cd2bf89e7a1ec8bd0.zip | |
Merge branch 'topic/misc' into for-linus
* topic/misc:
ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/via82xx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 1ef58c51c21..949fcaf6b70 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -85,6 +85,7 @@ static int joystick; static int ac97_clock = 48000; static char *ac97_quirk; static int dxs_support; +static int nodelay; module_param(index, int, 0444); MODULE_PARM_DESC(index, "Index value for VIA 82xx bridge."); @@ -102,6 +103,8 @@ module_param(ac97_quirk, charp, 0444); MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware."); module_param(dxs_support, int, 0444); MODULE_PARM_DESC(dxs_support, "Support for DXS channels (0 = auto, 1 = enable, 2 = disable, 3 = 48k only, 4 = no VRA, 5 = enable any sample rate)"); +module_param(nodelay, int, 0444); +MODULE_PARM_DESC(nodelay, "Disable 500ms init delay"); /* just for backward compatibility */ static int enable; @@ -549,7 +552,8 @@ static void snd_via82xx_codec_wait(struct snd_ac97 *ac97) int err; err = snd_via82xx_codec_ready(chip, ac97->num); /* here we need to wait fairly for long time.. */ - msleep(500); + if (!nodelay) + msleep(500); } static void snd_via82xx_codec_write(struct snd_ac97 *ac97, |