]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: go7007: fix a miss of snd_card_free
authorChuhong Yuan <hslester96@gmail.com>
Tue, 10 Dec 2019 03:15:48 +0000 (04:15 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Fri, 13 Dec 2019 08:30:20 +0000 (09:30 +0100)
go7007_snd_init() misses a snd_card_free() in an error path.
Add the missed call to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/usb/go7007/snd-go7007.c

index b05fa227ffb21de236a8c6b8edf00f82815498f9..95756cbb722f8ee426611610e84e7203aeeb1241 100644 (file)
@@ -236,22 +236,18 @@ int go7007_snd_init(struct go7007 *go)
        gosnd->capturing = 0;
        ret = snd_card_new(go->dev, index[dev], id[dev], THIS_MODULE, 0,
                           &gosnd->card);
-       if (ret < 0) {
-               kfree(gosnd);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_snd;
+
        ret = snd_device_new(gosnd->card, SNDRV_DEV_LOWLEVEL, go,
                        &go7007_snd_device_ops);
-       if (ret < 0) {
-               kfree(gosnd);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_card;
+
        ret = snd_pcm_new(gosnd->card, "go7007", 0, 0, 1, &gosnd->pcm);
-       if (ret < 0) {
-               snd_card_free(gosnd->card);
-               kfree(gosnd);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_card;
+
        strscpy(gosnd->card->driver, "go7007", sizeof(gosnd->card->driver));
        strscpy(gosnd->card->shortname, go->name, sizeof(gosnd->card->shortname));
        strscpy(gosnd->card->longname, gosnd->card->shortname,
@@ -262,11 +258,8 @@ int go7007_snd_init(struct go7007 *go)
                        &go7007_snd_capture_ops);
 
        ret = snd_card_register(gosnd->card);
-       if (ret < 0) {
-               snd_card_free(gosnd->card);
-               kfree(gosnd);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_card;
 
        gosnd->substream = NULL;
        go->snd_context = gosnd;
@@ -274,6 +267,12 @@ int go7007_snd_init(struct go7007 *go)
        ++dev;
 
        return 0;
+
+free_card:
+       snd_card_free(gosnd->card);
+free_snd:
+       kfree(gosnd);
+       return ret;
 }
 EXPORT_SYMBOL(go7007_snd_init);