diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/parisc/harmony.c | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/parisc/harmony.c')
| -rw-r--r-- | sound/parisc/harmony.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 41f870f8a11d..6055fd6d3b38 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
| @@ -975,9 +975,9 @@ snd_harmony_probe(struct parisc_device *padev) | |||
| 975 | struct snd_card *card; | 975 | struct snd_card *card; |
| 976 | struct snd_harmony *h; | 976 | struct snd_harmony *h; |
| 977 | 977 | ||
| 978 | card = snd_card_new(index, id, THIS_MODULE, 0); | 978 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 979 | if (card == NULL) | 979 | if (err < 0) |
| 980 | return -ENOMEM; | 980 | return err; |
| 981 | 981 | ||
| 982 | err = snd_harmony_create(card, padev, &h); | 982 | err = snd_harmony_create(card, padev, &h); |
| 983 | if (err < 0) | 983 | if (err < 0) |