]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] tlg2300: fix missing check for audio creation
authorAlan Cox <alan@linux.intel.com>
Tue, 4 Sep 2012 13:43:26 +0000 (10:43 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 23 Sep 2012 16:50:30 +0000 (13:50 -0300)
If we fail to set up the capture device we go through negative indexes and
badness happens. Add the missing test.
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=44551

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/usb/tlg2300/pd-alsa.c

index 9f8b7da56b671fe2eeee8f942e490dbb8b65c154..0c778695e2c37a161ee7f5946c19096fed71ed24 100644 (file)
@@ -305,6 +305,10 @@ int poseidon_audio_init(struct poseidon *p)
                return ret;
 
        ret = snd_pcm_new(card, "poseidon audio", 0, 0, 1, &pcm);
+       if (ret < 0) {
+               snd_free_card(card);
+               return ret;
+       }
        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &pcm_capture_ops);
        pcm->info_flags   = 0;
        pcm->private_data = p;