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

Commit b17bfca5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] usbaudio - Coping with short replies in usbmixer
  [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty
  [ALSA] Fix probe of non-PnP ISA devices
  [ALSA] version 1.0.14rc4
  [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops
  [ALSA] ASoC AC97 device reg bugfix
  [ALSA] ASoC AC97 static GPL symbol fix
  [ALSA] hda-codec - Make the mixer capability check more robust
  [ALSA] usb-audio: another Logitech QuickCam ID
parents 36dbe4d6 a04395ea

include/sound/soc.h

+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <sound/control.h>

#include <sound/ac97_codec.h>



#define SND_SOC_VERSION "0.13.0"

#define SND_SOC_VERSION "0.13.1"



/*

 * Convenience kcontrol builders
@@ -83,6 +83,7 @@ 
#define SND_SOC_DAI_AC97	0x1

#define SND_SOC_DAI_I2S		0x2

#define SND_SOC_DAI_PCM		0x4

#define SND_SOC_DAI_AC97_BUS	0x8	/* for custom i.e. non ac97_codec.c */



/*

 * DAI hardware audio formats
@@ -278,6 +279,7 @@ struct snd_soc_cpu_ops { 
struct snd_soc_codec_dai {

	char *name;

	int id;

	unsigned char type;



	/* DAI capabilities */

	struct snd_soc_pcm_stream playback;

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.14rc4"

#define CONFIG_SND_DATE " (Wed May 09 09:51:39 2007 UTC)"
 
#define CONFIG_SND_DATE " (Wed May 16 09:45:46 2007 UTC)"

sound/isa/cmi8330.c

+11 −4
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ module_param_array(wssdma, int, NULL, 0444); 
MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver.");



#ifdef CONFIG_PNP

static int isa_registered;

static int pnp_registered;

#endif
@@ -686,14 +687,18 @@ static int __init alsa_card_cmi8330_init(void) 
	int err;



	err = isa_register_driver(&snd_cmi8330_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;



	err = pnp_register_card_driver(&cmi8330_pnpc_driver);

	if (!err)

		pnp_registered = 1;



	if (isa_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_cmi8330_exit(void)
@@ -701,6 +706,8 @@ static void __exit alsa_card_cmi8330_exit(void) 
#ifdef CONFIG_PNP

	if (pnp_registered)

		pnp_unregister_card_driver(&cmi8330_pnpc_driver);



	if (isa_registered)

#endif

		isa_unregister_driver(&snd_cmi8330_driver);

}

sound/isa/cs423x/cs4236.c

+14 −6
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ module_param_array(dma2, int, NULL, 0444); 
MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");



#ifdef CONFIG_PNP

static int isa_registered;

static int pnpc_registered;

#ifdef CS4232

static int pnp_registered;
@@ -770,9 +771,9 @@ static int __init alsa_card_cs423x_init(void) 
	int err;



	err = isa_register_driver(&cs423x_isa_driver, SNDRV_CARDS);

	if (err < 0)

		return err;

#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;

#ifdef CS4232

	err = pnp_register_driver(&cs4232_pnp_driver);

	if (!err)
@@ -781,8 +782,14 @@ static int __init alsa_card_cs423x_init(void) 
	err = pnp_register_card_driver(&cs423x_pnpc_driver);

	if (!err)

		pnpc_registered = 1;

#endif /* CONFIG_PNP */

	return 0;

#ifdef CS4232

	if (pnp_registered)

		err = 0;

#endif

	if (isa_registered)

		err = 0;

#endif

	return err;

}



static void __exit alsa_card_cs423x_exit(void)
@@ -794,7 +801,8 @@ static void __exit alsa_card_cs423x_exit(void) 
	if (pnp_registered)

		pnp_unregister_driver(&cs4232_pnp_driver);

#endif

#endif /* CONFIG_PNP */

	if (isa_registered)

#endif

		isa_unregister_driver(&cs423x_isa_driver);

}

sound/isa/es18xx.c

+13 −6
Original line number Diff line number Diff line
@@ -2036,7 +2036,9 @@ module_param_array(dma2, int, NULL, 0444); 
MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");



#ifdef CONFIG_PNP

static int pnp_registered, pnpc_registered;

static int isa_registered;

static int pnp_registered;

static int pnpc_registered;



static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {

	{ .id = "ESS1869" },
@@ -2466,18 +2468,22 @@ static int __init alsa_card_es18xx_init(void) 
	int err;



	err = isa_register_driver(&snd_es18xx_isa_driver, SNDRV_CARDS);

	if (err < 0)

		return err;



#ifdef CONFIG_PNP

	if (!err)

		isa_registered = 1;



	err = pnp_register_driver(&es18xx_pnp_driver);

	if (!err)

		pnp_registered = 1;



	err = pnp_register_card_driver(&es18xx_pnpc_driver);

	if (!err)

		pnpc_registered = 1;



	if (isa_registered || pnp_registered)

		err = 0;

#endif

	return 0;

	return err;

}



static void __exit alsa_card_es18xx_exit(void)
@@ -2487,6 +2493,7 @@ static void __exit alsa_card_es18xx_exit(void) 
		pnp_unregister_card_driver(&es18xx_pnpc_driver);

	if (pnp_registered)

		pnp_unregister_driver(&es18xx_pnp_driver);

	if (isa_registered)

#endif

		isa_unregister_driver(&snd_es18xx_isa_driver);

}