ALSA fixes
Subsystems (3)
Linus,
please pull ALSA updates for 2.6.27-rc8 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
These are hopefully last fixes for 2.6.27: one is a patch I missed in the previous pull request for ASoC cs4270 codec fix, and another is a trivial fix for a Dell laptop.
Thanks!
Takashi
==
Jean Delvare (1):
ALSA: ASoC: Fix cs4270 error path
Takashi Iwai (1):
ALSA: hda - Fix model for Dell Inspiron 1525
sound/pci/hda/patch_sigmatel.c | 2 +- sound/soc/codecs/cs4270.c | 25 ++++++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-)
sound/pci/hda/patch_sigmatel.c +1 -1
@@ -1683,8 +1683,8 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {/* Dell 3 stack systems with verb table in BIOS */ SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x01f3 ,"Dell Inspiron 1420" ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0227 ,"Dell Vostro 1400 " ,STAC_DELL_BIOS ), -SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022f ,"Dell " ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022e ,"Dell " ,STAC_DELL_BIOS ), +SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x022f ,"Dell Inspiron 1525" ,STAC_DELL_3ST ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0242 ,"Dell " ,STAC_DELL_BIOS ),SND_PCI_QUIRK (PCI_VENDOR_ID_DELL ,0x0243 ,"Dell " ,STAC_DELL_BIOS ), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02ff, "Dell ", STAC_DELL_BIOS),
sound/soc/codecs/cs4270.c +18 -7
@@ -681,7 +681,7 @@ static int cs4270_probe(struct platform_device *pdev) ret =snd_soc_new_pcms (socdev,SNDRV_DEFAULT_IDX1 ,SNDRV_DEFAULT_STR1 );if (ret <0 ) {printk (KERN_ERR "cs4270: failed to create PCMs\n" ); -return ret; + goto error_free_codec; }#ifdef USE_I2C
@@ -690,8 +690,7 @@ static int cs4270_probe(struct platform_device *pdev) ret =i2c_add_driver (&cs4270_i2c_driver);if (ret) {printk (KERN_ERR "cs4270: failed to attach driver" ); -snd_soc_free_pcms (socdev); -return ret; + goto error_free_pcms; }/* Did we find a CS4270 on the I2C bus? */
@@ -713,10 +712,23 @@ static int cs4270_probe(struct platform_device *pdev) ret =snd_soc_register_card (socdev);if (ret <0 ) {printk (KERN_ERR "cs4270: failed to register card\n" ); -snd_soc_free_pcms (socdev); -return ret; + goto error_del_driver; } +return 0 ; + +error_del_driver: +#ifdef USE_I2C +i2c_del_driver (&cs4270_i2c_driver); + +error_free_pcms: +#endif +snd_soc_free_pcms (socdev); + +error_free_codec: +kfree (socdev->codec); + socdev->codec =NULL ; +return ret; }
@@ -727,8 +739,7 @@ static int cs4270_remove(struct platform_device *pdev)snd_soc_free_pcms (socdev);#ifdef USE_I2C -if (socdev->codec->control_data) -i2c_del_driver (&cs4270_i2c_driver); +i2c_del_driver (&cs4270_i2c_driver);#endif kfree (socdev->codec);