mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
Merge branch 'topic/misc' into for-linus
* topic/misc: ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait
This commit is contained in:
commit
b61eaa924c
1 changed files with 5 additions and 1 deletions
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue