Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b61eaa92 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus 

* topic/misc:
  ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait
parents 11a93fd9 115551d9

sound/pci/via82xx.c

+5 −1
Original line number Diff line number Diff line
@@ -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,6 +552,7 @@ 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.. */

	if (!nodelay)

		msleep(500);

}