Skip to content

Commit

Permalink
ALSA: ac97: Fix double free of ac97_codec_device
Browse files Browse the repository at this point in the history
put_device will call ac97_codec_release to free
ac97_codec_device and other resources, so remove the kfree
and other redundant code.

Fixes: 74426fb ("ALSA: ac97: add an ac97 bus")
Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Ding Xiang authored and tiwai committed Jul 23, 2019
1 parent 3b81799 commit 607975b
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions sound/ac97/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,12 @@ static int ac97_codec_add(struct ac97_controller *ac97_ctrl, int idx,
vendor_id);

ret = device_add(&codec->dev);
if (ret)
goto err_free_codec;
if (ret) {
put_device(&codec->dev);
return ret;
}

return 0;
err_free_codec:
of_node_put(codec->dev.of_node);
put_device(&codec->dev);
kfree(codec);
ac97_ctrl->codecs[idx] = NULL;

return ret;
}

unsigned int snd_ac97_bus_scan_one(struct ac97_controller *adrv,
Expand Down

0 comments on commit 607975b

Please sign in to comment.