summaryrefslogtreecommitdiffstats
path: root/sound/pci/lola/lola.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-06-07 20:37:12 +0100
committerMark Brown <broonie@kernel.org>2022-06-07 20:37:12 +0100
commit073350da0aa2aead9df7927a1c1046ebf5cdd816 (patch)
treed1d5f86c817b24f245e218766505962cca3c5581 /sound/pci/lola/lola.c
parent2abdf9f80019e8244d3806ed0e1c9f725e50b452 (diff)
parentf2906aa863381afb0015a9eb7fefad885d4e5a56 (diff)
downloadlinux-073350da0aa2aead9df7927a1c1046ebf5cdd816.tar.bz2
Merge tag 'v5.19-rc1' into asoc-5.19
Linux 5.19-rc1
Diffstat (limited to 'sound/pci/lola/lola.c')
-rw-r--r--sound/pci/lola/lola.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c
index 5269a1d396a5..1aa30e90b86a 100644
--- a/sound/pci/lola/lola.c
+++ b/sound/pci/lola/lola.c
@@ -637,8 +637,8 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, int dev)
return 0;
}
-static int lola_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
+static int __lola_probe(struct pci_dev *pci,
+ const struct pci_device_id *pci_id)
{
static int dev;
struct snd_card *card;
@@ -687,6 +687,12 @@ static int lola_probe(struct pci_dev *pci,
return 0;
}
+static int lola_probe(struct pci_dev *pci,
+ const struct pci_device_id *pci_id)
+{
+ return snd_card_free_on_error(&pci->dev, __lola_probe(pci, pci_id));
+}
+
/* PCI IDs */
static const struct pci_device_id lola_ids[] = {
{ PCI_VDEVICE(DIGIGRAM, 0x0001) },