diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-03-28 20:22:18 -0400 |
| commit | 90f959bcb386da2c71613dcefc6a285e054a539e (patch) | |
| tree | ee3e9dd4111d4aad12e579cb0c2c159114dff263 /sound/mips/hal2.c | |
| parent | 41f13fe81dd1b08723ab9f3fc3c7f29cfa81f1a5 (diff) | |
| parent | 07d43ba98621f08e252a48c96b258b4d572b0257 (diff) | |
drm: merge Linux master into HEAD
Conflicts:
drivers/gpu/drm/drm_info.c
drivers/gpu/drm/drm_proc.c
drivers/gpu/drm/i915/i915_gem_debugfs.c
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) { |