diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-05-22 23:03:29 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2022-05-22 23:03:29 +0200 |
| commit | da50aad6d86716aa48a2b8463c85caea77c0355f (patch) | |
| tree | c9604cc380e99e613c25ec06cbfcd5009c4575ba /sound/pci/es1938.c | |
| parent | power: supply: bq24190_charger: using pm_runtime_resume_and_get instead of pm... (diff) | |
| parent | power: supply: ab8500_fg: Allocate wq in probe (diff) | |
| download | linux-da50aad6d86716aa48a2b8463c85caea77c0355f.tar.xz linux-da50aad6d86716aa48a2b8463c85caea77c0355f.zip | |
Merge power-supply 'fixes' branch
Merge power-supply fixes, that missed the v5.18 merge window
into power-supply's for-next branch.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
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, |