diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:49:39 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-04-13 11:49:49 +0300 |
commit | faf5933c79545412ea63f0c3d15c261d104e1dde (patch) | |
tree | 078b01613e5a52810eff3e8e1fd857ad08935262 /sound/pci/es1968.c | |
parent | 651a88798412e216f337d70181127e847f00a4b7 (diff) | |
parent | 24d0c9f0e7de95fe3e3e0067cbea1cd5d413244b (diff) | |
download | linux-faf5933c79545412ea63f0c3d15c261d104e1dde.tar.xz |
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/es1968.c')
-rw-r--r-- | sound/pci/es1968.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 6a8a02a9ecf4..4a7e20bb11bc 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c @@ -2741,8 +2741,8 @@ static int snd_es1968_create(struct snd_card *card, /* */ -static int snd_es1968_probe(struct pci_dev *pci, - const struct pci_device_id *pci_id) +static int __snd_es1968_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) { static int dev; struct snd_card *card; @@ -2848,6 +2848,12 @@ static int snd_es1968_probe(struct pci_dev *pci, return 0; } +static int snd_es1968_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + return snd_card_free_on_error(&pci->dev, __snd_es1968_probe(pci, pci_id)); +} + static struct pci_driver es1968_driver = { .name = KBUILD_MODNAME, .id_table = snd_es1968_ids, |