Commit 239a2faa authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

cx231xx-audio: fix init error path

commit fff1abc4 upstream.

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

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

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>
[bwh: Backported to 3.2: adjust filename, context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 79548079
...@@ -652,10 +652,8 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -652,10 +652,8 @@ static int cx231xx_audio_init(struct cx231xx *dev)
spin_lock_init(&adev->slock); spin_lock_init(&adev->slock);
err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm); err = snd_pcm_new(card, "Cx231xx Audio", 0, 0, 1, &pcm);
if (err < 0) { if (err < 0)
snd_card_free(card); goto err_free_card;
return err;
}
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE,
&snd_cx231xx_pcm_capture); &snd_cx231xx_pcm_capture);
...@@ -670,10 +668,9 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -670,10 +668,9 @@ static int cx231xx_audio_init(struct cx231xx *dev)
INIT_WORK(&dev->wq_trigger, audio_trigger); INIT_WORK(&dev->wq_trigger, audio_trigger);
err = snd_card_register(card); err = snd_card_register(card);
if (err < 0) { if (err < 0)
snd_card_free(card); goto err_free_card;
return err;
}
adev->sndcard = card; adev->sndcard = card;
adev->udev = dev->udev; adev->udev = dev->udev;
...@@ -691,10 +688,10 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -691,10 +688,10 @@ static int cx231xx_audio_init(struct cx231xx *dev)
cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n", cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
adev->end_point_addr, adev->num_alt); adev->end_point_addr, adev->num_alt);
adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL); adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);
if (!adev->alt_max_pkt_size) {
if (adev->alt_max_pkt_size == NULL) {
cx231xx_errdev("out of memory!\n"); cx231xx_errdev("out of memory!\n");
return -ENOMEM; err = -ENOMEM;
goto err_free_card;
} }
for (i = 0; i < adev->num_alt; i++) { for (i = 0; i < adev->num_alt; i++) {
...@@ -708,6 +705,11 @@ static int cx231xx_audio_init(struct cx231xx *dev) ...@@ -708,6 +705,11 @@ static int cx231xx_audio_init(struct cx231xx *dev)
} }
return 0; return 0;
err_free_card:
snd_card_free(card);
return err;
} }
static int cx231xx_audio_fini(struct cx231xx *dev) static int cx231xx_audio_fini(struct cx231xx *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment