projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-amd-pmu-fixes' into HEAD
[linux-2.6-microblaze.git]
/
sound
/
pci
/
es1968.c
diff --git
a/sound/pci/es1968.c
b/sound/pci/es1968.c
index
6a8a02a
..
4a7e20b
100644
(file)
--- 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;
{
static int dev;
struct snd_card *card;
@@
-2848,6
+2848,12
@@
static int snd_es1968_probe(struct pci_dev *pci,
return 0;
}
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,
static struct pci_driver es1968_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_es1968_ids,