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/es1938.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/es1938.c')
| -rw-r--r-- | sound/pci/es1938.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 00b976f42a3d..e34ec6f89e7e 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -1716,8 +1716,8 @@ static int snd_es1938_mixer(struct es1938 *chip) } -static int snd_es1938_probe(struct pci_dev *pci, - const struct pci_device_id *pci_id) +static int __snd_es1938_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) { static int dev; struct snd_card *card; @@ -1796,6 +1796,12 @@ static int snd_es1938_probe(struct pci_dev *pci, return 0; } +static int snd_es1938_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) +{ + return snd_card_free_on_error(&pci->dev, __snd_es1938_probe(pci, pci_id)); +} + static struct pci_driver es1938_driver = { .name = KBUILD_MODNAME, .id_table = snd_es1938_ids, |