Commit 2f853991 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "All small regression or small fixes, nothing surprising at this stage.

   - regression fix for intel Mac Mini quirk
   - compress ioctl error fix
   - ASoC fixes for control change notifications, some UI fixes,
     driver-specific fixes (resource leak, build errors, etc)"

* tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Fix missing fixup for Mac Mini with STAC9221
  ASoC: wm0010: Fix resource leak
  ASoC: au1x: Fix build
  ASoC: bf5xx-ac97: Fix compile error with SND_BF5XX_HAVE_COLD_RESET
  ASoC: bfin-ac97: Fix prototype error following AC'97 refactoring
  ALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION
  ASoC: dapm: Fix return value of snd_soc_dapm_put_{volsw,enum_virt}()
parents 72a67a94 697aebab

sound/core/compress_offload.c

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) 
	mutex_lock(&stream->device->lock);

	switch (_IOC_NR(cmd)) {

	case _IOC_NR(SNDRV_COMPRESS_IOCTL_VERSION):

		put_user(SNDRV_COMPRESS_VERSION,

		retval = put_user(SNDRV_COMPRESS_VERSION,

				(int __user *)arg) ? -EFAULT : 0;

		break;

	case _IOC_NR(SNDRV_COMPRESS_GET_CAPS):

sound/pci/hda/hda_auto_parser.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, 
		}

	}

	if (id < 0 && quirk) {

		for (q = quirk; q->subvendor; q++) {

		for (q = quirk; q->subvendor || q->subdevice; q++) {

			unsigned int vendorid =

				q->subdevice | (q->subvendor << 16);

			unsigned int mask = 0xffff0000 | q->subdevice_mask;

sound/pci/hda/patch_sigmatel.c

+1 −0
Original line number Diff line number Diff line
@@ -2819,6 +2819,7 @@ static const struct hda_pintbl ecs202_pin_configs[] = { 


/* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */

static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = {

	SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3),

	SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1),

	SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2),

	SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),

sound/soc/au1x/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static struct platform_driver au1xac97c_driver = { 
	.remove		= au1xac97c_drvremove,

};



module_platform_driver(&au1xac97c_driver);

module_platform_driver(au1xac97c_driver);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Au1000/1500/1100 AC97C ASoC driver");

sound/soc/blackfin/bf5xx-ac97.c

+3 −2
Original line number Diff line number Diff line
@@ -294,11 +294,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) 
	/* Request PB3 as reset pin */

	ret = devm_gpio_request_one(&pdev->dev,

				    CONFIG_SND_BF5XX_RESET_GPIO_NUM,

				    GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") {

				    GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET");

	if (ret) {

		dev_err(&pdev->dev,

			"Failed to request GPIO_%d for reset: %d\n",

			CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret);

		goto gpio_err;

		return ret;

	}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE