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/pci/rme9652/rme9652.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/pci/rme9652/rme9652.c')
| -rw-r--r-- | sound/pci/rme9652/rme9652.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c index 2570907134d7..bc539abb2105 100644 --- a/sound/pci/rme9652/rme9652.c +++ b/sound/pci/rme9652/rme9652.c | |||
| @@ -2594,11 +2594,11 @@ static int __devinit snd_rme9652_probe(struct pci_dev *pci, | |||
| 2594 | return -ENOENT; | 2594 | return -ENOENT; |
| 2595 | } | 2595 | } |
| 2596 | 2596 | ||
| 2597 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 2597 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, |
| 2598 | sizeof(struct snd_rme9652)); | 2598 | sizeof(struct snd_rme9652), &card); |
| 2599 | 2599 | ||
| 2600 | if (!card) | 2600 | if (err < 0) |
| 2601 | return -ENOMEM; | 2601 | return err; |
| 2602 | 2602 | ||
| 2603 | rme9652 = (struct snd_rme9652 *) card->private_data; | 2603 | rme9652 = (struct snd_rme9652 *) card->private_data; |
| 2604 | card->private_free = snd_rme9652_card_free; | 2604 | card->private_free = snd_rme9652_card_free; |