Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fff1abc4 authored by Johan Hovold's avatar Johan Hovold Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx-audio: fix init error path 



Make sure to release the snd_card also on a late allocation error.

Fixes: e0d3bafd ("V4L/DVB (10954): Add cx231xx USB driver")

Cc: stable <stable@vger.kernel.org>     # 2.6.30
Cc: Sri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 0cd273bb

drivers/media/usb/cx231xx/cx231xx-audio.c

+14 −11
Original line number Diff line number Diff line
@@ -670,10 +670,8 @@ static int cx231xx_audio_init(struct cx231xx *dev) 


	spin_lock_init(&adev->slock);

	err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}

	if (err < 0)

		goto err_free_card;



	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,

			&snd_cx231xx_pcm_capture);
@@ -687,10 +685,9 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
	INIT_WORK(&dev->wq_trigger, audio_trigger);



	err = snd_card_register(card);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}

	if (err < 0)

		goto err_free_card;



	adev->sndcard = card;

	adev->udev = dev->udev;
@@ -709,9 +706,10 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
		"audio EndPoint Addr 0x%x, Alternate settings: %i\n",

		adev->end_point_addr, adev->num_alt);

	adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);



	if (adev->alt_max_pkt_size == NULL)

		return -ENOMEM;

	if (!adev->alt_max_pkt_size) {

		err = -ENOMEM;

		goto err_free_card;

	}



	for (i = 0; i < adev->num_alt; i++) {

		u16 tmp =
@@ -725,6 +723,11 @@ static int cx231xx_audio_init(struct cx231xx *dev) 
	}



	return 0;



err_free_card:

	snd_card_free(card);



	return err;

}



static int cx231xx_audio_fini(struct cx231xx *dev)