diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/sparc/amd7930.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/sparc/amd7930.c')
| -rw-r--r-- | sound/sparc/amd7930.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index f87933e48812..ba38912614b4 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
| @@ -1018,9 +1018,10 @@ static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_de | |||
| 1018 | return -ENOENT; | 1018 | return -ENOENT; |
| 1019 | } | 1019 | } |
| 1020 | 1020 | ||
| 1021 | card = snd_card_new(index[dev_num], id[dev_num], THIS_MODULE, 0); | 1021 | err = snd_card_create(index[dev_num], id[dev_num], THIS_MODULE, 0, |
| 1022 | if (card == NULL) | 1022 | &card); |
| 1023 | return -ENOMEM; | 1023 | if (err < 0) |
| 1024 | return err; | ||
| 1024 | 1025 | ||
| 1025 | strcpy(card->driver, "AMD7930"); | 1026 | strcpy(card->driver, "AMD7930"); |
| 1026 | strcpy(card->shortname, "Sun AMD7930"); | 1027 | strcpy(card->shortname, "Sun AMD7930"); |