diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:33 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:33 +0200 |
| commit | 1172234cbe94658c16bc83e50ca57b5a47085209 (patch) | |
| tree | 15bddd783be48899167a9cd764d3f23cfd05572e /sound/pci/echoaudio/echoaudio.c | |
| parent | 85255c0e078158ede61ff8bd296e306db6f7ed19 (diff) | |
| parent | b0cc58a25d04160d39a80e436847eaa2fbc5aa09 (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci/echoaudio/echoaudio.c')
| -rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 8dab82d7d19d..668a5ec04499 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -2184,10 +2184,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci, goto ctl_error; #endif - if ((err = snd_card_register(card)) < 0) { - snd_card_free(card); + err = snd_card_register(card); + if (err < 0) goto ctl_error; - } snd_printk(KERN_INFO "Card registered: %s\n", card->longname); pci_set_drvdata(pci, chip); |