aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/pci/cmipci.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-04-13 10:49:39 +0200
committerTakashi Iwai <tiwai@suse.de>2022-04-13 10:49:49 +0200
commitfaf5933c79545412ea63f0c3d15c261d104e1dde (patch)
tree078b01613e5a52810eff3e8e1fd857ad08935262 /sound/pci/cmipci.c
parentMerge branch 'topic/cs35l41' into for-next (diff)
parentALSA: usb-audio: Limit max buffer and period sizes per time (diff)
downloadwireguard-linux-faf5933c79545412ea63f0c3d15c261d104e1dde.tar.xz
wireguard-linux-faf5933c79545412ea63f0c3d15c261d104e1dde.zip
Merge branch 'for-linus' into for-next
Back-merge the 5.18-rc3 devel branch, as it influences on the further development. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/cmipci.c')
-rw-r--r--sound/pci/cmipci.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index dab801d9d3b4..727db6d43391 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -3247,15 +3247,19 @@ static int snd_cmipci_probe(struct pci_dev *pci,
err = snd_cmipci_create(card, pci, dev);
if (err < 0)
- return err;
+ goto error;
err = snd_card_register(card);
if (err < 0)
- return err;
+ goto error;
pci_set_drvdata(pci, card);
dev++;
return 0;
+
+ error:
+ snd_card_free(card);
+ return err;
}
#ifdef CONFIG_PM_SLEEP