Commit e3145dfb authored by Jean Delvare's avatar Jean Delvare Committed by Takashi Iwai
Browse files

ALSA: ASoC: Fix cs4270 error path 



The error path in cs4270_probe/cs4270_remove is pretty broken:
* If cs4270_probe fails, codec is leaked.
* If snd_soc_register_card fails, cs4270_i2c_driver stays registered.
* If I2C support is enabled but no I2C device is found, i2c_del_driver
  is never called (neither in cs4270_probe nor in cs4270_remove.

Fix all 3 problems by implementing a clean error path in cs4270_probe
and jumping to its labels as needed.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9778e9a0

sound/soc/codecs/cs4270.c

+18 −7
Original line number Original line Diff line number Diff line
@@ -681,7 +681,7 @@ static int cs4270_probe(struct platform_device *pdev) 
	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);

	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);

	if (ret < 0) {

	if (ret < 0) {

		printk(KERN_ERR "cs4270: failed to create PCMs\n");

		printk(KERN_ERR "cs4270: failed to create PCMs\n");

		return ret;

		goto error_free_codec;

	}

	}





#ifdef USE_I2C

#ifdef USE_I2C
@@ -690,8 +690,7 @@ static int cs4270_probe(struct platform_device *pdev) 
	ret = i2c_add_driver(&cs4270_i2c_driver);

	ret = i2c_add_driver(&cs4270_i2c_driver);

	if (ret) {

	if (ret) {

		printk(KERN_ERR "cs4270: failed to attach driver");

		printk(KERN_ERR "cs4270: failed to attach driver");

		snd_soc_free_pcms(socdev);

		goto error_free_pcms;

		return ret;

	}

	}





	/* Did we find a CS4270 on the I2C bus? */

	/* 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);

	ret = snd_soc_register_card(socdev);

	if (ret < 0) {

	if (ret < 0) {

		printk(KERN_ERR "cs4270: failed to register card\n");

		printk(KERN_ERR "cs4270: failed to register card\n");

		snd_soc_free_pcms(socdev);

		goto error_del_driver;

		return ret;

	}

	}





	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;

	return ret;

}

}
@@ -727,7 +739,6 @@ static int cs4270_remove(struct platform_device *pdev) 
	snd_soc_free_pcms(socdev);

	snd_soc_free_pcms(socdev);





#ifdef USE_I2C

#ifdef USE_I2C

	if (socdev->codec->control_data)

	i2c_del_driver(&cs4270_i2c_driver);

	i2c_del_driver(&cs4270_i2c_driver);

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE