Skip to content

Commit 1798778

Browse files
torvaldstorvalds
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: Fix compile warning in wm8750.c ASoC: omap: Update e-mail address of Jarkko Nikula ASoC: SAMSUNG: Add I2S0 internal dma driver ASoC: Terminate WM8750 SPI device ID table ASoC: Add missing break in WM8994 probe ALSA: snd-usb-caiaq: Correct offset fields of outbound iso_frame_desc ALSA: azt3328 - adjust error handling code to include debugging code ALSA: hda - Add CONFIG_SND_HDA_POWER_SAVE to stac_vrefout_set() ALSA: usb-audio - Add quirk for BOSS Micro BR-80 ASoC: Fix typo in wm8750 spi_ids ASoC: Fix warning in Speyside WM8962 ASoC: Fix SPI driver binding for WM8987 ASoC: Fix binding of WM8750 on Jive ASoC: WM8903: Free IRQ on device removal ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
2 parents 4c74916 + c012cdc commit 1798778

File tree

22 files changed

+573
-25
lines changed

22 files changed

+573
-25
lines changed

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
46044604
F: arch/arm/mach-omap2/clockdomain44xx.c
46054605

46064606
OMAP AUDIO SUPPORT
4607-
M: Jarkko Nikula <jhnikula@gmail.com>
4607+
M: Jarkko Nikula <jarkko.nikula@bitmer.com>
46084608
L: [email protected] (subscribers-only)
46094609
L: [email protected]
46104610
S: Maintained

‎include/sound/tlv320aic3x.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Platform data for Texas Instruments TLV320AIC3x codec
33
*
4-
* Author: Jarkko Nikula <jhnikula@gmail.com>
4+
* Author: Jarkko Nikula <jarkko.nikula@bitmer.com>
55
*
66
* This program is free software; you can redistribute it and/or modify
77
* it under the terms of the GNU General Public License version 2 as

‎sound/pci/azt3328.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2625,16 +2625,19 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
26252625
int err;
26262626

26272627
snd_azf3328_dbgcallenter();
2628-
if (dev >= SNDRV_CARDS)
2629-
return -ENODEV;
2628+
if (dev >= SNDRV_CARDS) {
2629+
err = -ENODEV;
2630+
goto out;
2631+
}
26302632
if (!enable[dev]) {
26312633
dev++;
2632-
return -ENOENT;
2634+
err = -ENOENT;
2635+
goto out;
26332636
}
26342637

26352638
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
26362639
if (err < 0)
2637-
return err;
2640+
goto out;
26382641

26392642
strcpy(card->driver, "AZF3328");
26402643
strcpy(card->shortname, "Aztech AZF3328 (PCI168)");

‎sound/pci/hda/patch_sigmatel.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol,
673673
return 0;
674674
}
675675

676+
#ifdef CONFIG_SND_HDA_POWER_SAVE
676677
static int stac_vrefout_set(struct hda_codec *codec,
677678
hda_nid_t nid, unsigned int new_vref)
678679
{
@@ -696,6 +697,7 @@ static int stac_vrefout_set(struct hda_codec *codec,
696697

697698
return 1;
698699
}
700+
#endif
699701

700702
static unsigned int stac92xx_vref_set(struct hda_codec *codec,
701703
hda_nid_t nid, unsigned int new_vref)

‎sound/soc/codecs/wm8750.c‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,11 +778,19 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi)
778778
return 0;
779779
}
780780

781+
static const struct spi_device_id wm8750_spi_ids[] = {
782+
{ "wm8750", 0 },
783+
{ "wm8987", 0 },
784+
{ },
785+
};
786+
MODULE_DEVICE_TABLE(spi, wm8750_spi_ids);
787+
781788
static struct spi_driver wm8750_spi_driver = {
782789
.driver = {
783790
.name = "wm8750-codec",
784791
.owner = THIS_MODULE,
785792
},
793+
.id_table = wm8750_spi_ids,
786794
.probe = wm8750_spi_probe,
787795
.remove = __devexit_p(wm8750_spi_remove),
788796
};

‎sound/soc/codecs/wm8903.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,8 +2046,13 @@ static int wm8903_probe(struct snd_soc_codec *codec)
20462046
/* power down chip */
20472047
static int wm8903_remove(struct snd_soc_codec *codec)
20482048
{
2049+
struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
2050+
20492051
wm8903_free_gpio(codec);
20502052
wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);
2053+
if (wm8903->irq)
2054+
free_irq(wm8903->irq, codec);
2055+
20512056
return 0;
20522057
}
20532058

‎sound/soc/codecs/wm8994.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
29812981
wm8994->hubs.dcs_readback_mode = 1;
29822982
break;
29832983
}
2984+
break;
29842985

29852986
case WM8958:
29862987
wm8994->hubs.dcs_readback_mode = 1;

‎sound/soc/omap/n810.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (C) 2008 Nokia Corporation
55
*
6-
* Contact: Jarkko Nikula <jhnikula@gmail.com>
6+
* Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
77
*
88
* This program is free software; you can redistribute it and/or
99
* modify it under the terms of the GNU General Public License
@@ -402,6 +402,6 @@ static void __exit n810_soc_exit(void)
402402
module_init(n810_soc_init);
403403
module_exit(n810_soc_exit);
404404

405-
MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");
405+
MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");
406406
MODULE_DESCRIPTION("ALSA SoC Nokia N810");
407407
MODULE_LICENSE("GPL");

‎sound/soc/omap/omap-mcbsp.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (C) 2008 Nokia Corporation
55
*
6-
* Contact: Jarkko Nikula <jhnikula@gmail.com>
6+
* Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
77
* Peter Ujfalusi <[email protected]>
88
*
99
* This program is free software; you can redistribute it and/or
@@ -780,6 +780,6 @@ static void __exit snd_omap_mcbsp_exit(void)
780780
}
781781
module_exit(snd_omap_mcbsp_exit);
782782

783-
MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");
783+
MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@bitmer.com>");
784784
MODULE_DESCRIPTION("OMAP I2S SoC Interface");
785785
MODULE_LICENSE("GPL");

‎sound/soc/omap/omap-mcbsp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (C) 2008 Nokia Corporation
55
*
6-
* Contact: Jarkko Nikula <jhnikula@gmail.com>
6+
* Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>
77
* Peter Ujfalusi <[email protected]>
88
*
99
* This program is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)