diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /sound/pci/riptide/riptide.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'sound/pci/riptide/riptide.c')
| -rw-r--r-- | sound/pci/riptide/riptide.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 3caacfb9d8e0..6f1034417a02 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c | |||
| @@ -2102,9 +2102,9 @@ snd_card_riptide_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) | |||
| 2102 | return -ENOENT; | 2102 | return -ENOENT; |
| 2103 | } | 2103 | } |
| 2104 | 2104 | ||
| 2105 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2105 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 2106 | if (card == NULL) | 2106 | if (err < 0) |
| 2107 | return -ENOMEM; | 2107 | return err; |
| 2108 | if ((err = snd_riptide_create(card, pci, &chip)) < 0) { | 2108 | if ((err = snd_riptide_create(card, pci, &chip)) < 0) { |
| 2109 | snd_card_free(card); | 2109 | snd_card_free(card); |
| 2110 | return err; | 2110 | return err; |