diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 12:57:37 -0400 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/mips/hal2.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
Diffstat (limited to 'sound/mips/hal2.c')
| -rw-r--r-- | sound/mips/hal2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index db495be01861..c52691c2fc46 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c | |||
| @@ -878,9 +878,9 @@ static int __devinit hal2_probe(struct platform_device *pdev) | |||
| 878 | struct snd_hal2 *chip; | 878 | struct snd_hal2 *chip; |
| 879 | int err; | 879 | int err; |
| 880 | 880 | ||
| 881 | card = snd_card_new(index, id, THIS_MODULE, 0); | 881 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 882 | if (card == NULL) | 882 | if (err < 0) |
| 883 | return -ENOMEM; | 883 | return err; |
| 884 | 884 | ||
| 885 | err = hal2_create(card, &chip); | 885 | err = hal2_create(card, &chip); |
| 886 | if (err < 0) { | 886 | if (err < 0) { |