diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 23:03:57 +0100 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/adlib.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/adlib.c')
| -rw-r--r-- | sound/isa/adlib.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/adlib.c b/sound/isa/adlib.c index 374b7177e11..7465ae036e0 100644 --- a/sound/isa/adlib.c +++ b/sound/isa/adlib.c @@ -53,10 +53,10 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) struct snd_opl3 *opl3; int error; - card = snd_card_new(index[n], id[n], THIS_MODULE, 0); - if (!card) { + error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); + if (error < 0) { dev_err(dev, "could not create card\n"); - return -EINVAL; + return error; } card->private_data = request_region(port[n], 4, CRD_NAME); |