tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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}()

Linus Torvalds 2f853991 72a67a94

+21 -21
+1 -1
sound/core/compress_offload.c
··· 743 743 mutex_lock(&stream->device->lock); 744 744 switch (_IOC_NR(cmd)) { 745 745 case _IOC_NR(SNDRV_COMPRESS_IOCTL_VERSION): 746 - put_user(SNDRV_COMPRESS_VERSION, 746 + retval = put_user(SNDRV_COMPRESS_VERSION, 747 747 (int __user *)arg) ? -EFAULT : 0; 748 748 break; 749 749 case _IOC_NR(SNDRV_COMPRESS_GET_CAPS):
+1 -1
sound/pci/hda/hda_auto_parser.c
··· 860 860 } 861 861 } 862 862 if (id < 0 && quirk) { 863 - for (q = quirk; q->subvendor; q++) { 863 + for (q = quirk; q->subvendor || q->subdevice; q++) { 864 864 unsigned int vendorid = 865 865 q->subdevice | (q->subvendor << 16); 866 866 unsigned int mask = 0xffff0000 | q->subdevice_mask;
+1
sound/pci/hda/patch_sigmatel.c
··· 2819 2819 2820 2820 /* codec SSIDs for Intel Mac sharing the same PCI SSID 8384:7680 */ 2821 2821 static const struct snd_pci_quirk stac922x_intel_mac_fixup_tbl[] = { 2822 + SND_PCI_QUIRK(0x0000, 0x0100, "Mac Mini", STAC_INTEL_MAC_V3), 2822 2823 SND_PCI_QUIRK(0x106b, 0x0800, "Mac", STAC_INTEL_MAC_V1), 2823 2824 SND_PCI_QUIRK(0x106b, 0x0600, "Mac", STAC_INTEL_MAC_V2), 2824 2825 SND_PCI_QUIRK(0x106b, 0x0700, "Mac", STAC_INTEL_MAC_V2),
+1 -1
sound/soc/au1x/ac97c.c
··· 341 341 .remove = au1xac97c_drvremove, 342 342 }; 343 343 344 - module_platform_driver(&au1xac97c_driver); 344 + module_platform_driver(au1xac97c_driver); 345 345 346 346 MODULE_LICENSE("GPL"); 347 347 MODULE_DESCRIPTION("Au1000/1500/1100 AC97C ASoC driver");
+3 -2
sound/soc/blackfin/bf5xx-ac97.c
··· 294 294 /* Request PB3 as reset pin */ 295 295 ret = devm_gpio_request_one(&pdev->dev, 296 296 CONFIG_SND_BF5XX_RESET_GPIO_NUM, 297 - GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") { 297 + GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET"); 298 + if (ret) { 298 299 dev_err(&pdev->dev, 299 300 "Failed to request GPIO_%d for reset: %d\n", 300 301 CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret); 301 - goto gpio_err; 302 + return ret; 302 303 } 303 304 #endif 304 305
-1
sound/soc/blackfin/bf5xx-ac97.h
··· 9 9 #ifndef _BF5XX_AC97_H 10 10 #define _BF5XX_AC97_H 11 11 12 - extern struct snd_ac97_bus_ops bf5xx_ac97_ops; 13 12 extern struct snd_ac97 *ac97; 14 13 /* Frame format in memory, only support stereo currently */ 15 14 struct ac97_frame {
+12 -12
sound/soc/codecs/wm0010.c
··· 410 410 rec->command, rec->length); 411 411 len = rec->length + 8; 412 412 413 + xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); 414 + if (!xfer) { 415 + dev_err(codec->dev, "Failed to allocate xfer\n"); 416 + ret = -ENOMEM; 417 + goto abort; 418 + } 419 + 420 + xfer->codec = codec; 421 + list_add_tail(&xfer->list, &xfer_list); 422 + 413 423 out = kzalloc(len, GFP_KERNEL); 414 424 if (!out) { 415 425 dev_err(codec->dev, ··· 427 417 ret = -ENOMEM; 428 418 goto abort1; 429 419 } 420 + xfer->t.rx_buf = out; 430 421 431 422 img = kzalloc(len, GFP_KERNEL); 432 423 if (!img) { ··· 436 425 ret = -ENOMEM; 437 426 goto abort1; 438 427 } 428 + xfer->t.tx_buf = img; 439 429 440 430 byte_swap_64((u64 *)&rec->command, img, len); 441 - 442 - xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); 443 - if (!xfer) { 444 - dev_err(codec->dev, "Failed to allocate xfer\n"); 445 - ret = -ENOMEM; 446 - goto abort1; 447 - } 448 - 449 - xfer->codec = codec; 450 - list_add_tail(&xfer->list, &xfer_list); 451 431 452 432 spi_message_init(&xfer->m); 453 433 xfer->m.complete = wm0010_boot_xfer_complete; 454 434 xfer->m.context = xfer; 455 - xfer->t.tx_buf = img; 456 - xfer->t.rx_buf = out; 457 435 xfer->t.len = len; 458 436 xfer->t.bits_per_word = 8; 459 437
+2 -3
sound/soc/soc-dapm.c
··· 2733 2733 } 2734 2734 2735 2735 mutex_unlock(&card->dapm_mutex); 2736 - return 0; 2736 + return change; 2737 2737 } 2738 2738 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw); 2739 2739 ··· 2861 2861 struct soc_enum *e = 2862 2862 (struct soc_enum *)kcontrol->private_value; 2863 2863 int change; 2864 - int ret = 0; 2865 2864 int wi; 2866 2865 2867 2866 if (ucontrol->value.enumerated.item[0] >= e->max) ··· 2880 2881 } 2881 2882 2882 2883 mutex_unlock(&card->dapm_mutex); 2883 - return ret; 2884 + return change; 2884 2885 } 2885 2886 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt); 2886 2887