diff options
| author | Takashi Iwai | 2009-02-16 23:03:57 +0100 |
|---|---|---|
| committer | Takashi Iwai | 2009-02-16 23:03:57 +0100 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/es1688 | |
| parent | ALSA: isa/*: Add missing KERN_* prefix to printk (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | kernel-qcow2-linux-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.gz kernel-qcow2-linux-96cf45cf559be375de29dd45afc50fa8946fb2aa.tar.xz kernel-qcow2-linux-96cf45cf559be375de29dd45afc50fa8946fb2aa.zip | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/es1688')
| -rw-r--r-- | sound/isa/es1688/es1688.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index b0eb0cf6050e..442b081cafb7 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -125,9 +125,9 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n) struct snd_pcm *pcm; int error; - card = snd_card_new(index[n], id[n], THIS_MODULE, 0); - if (!card) - return -EINVAL; + error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); + if (error < 0) + return error; error = snd_es1688_legacy_create(card, dev, n, &chip); if (error < 0) |