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/cmipci.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'sound/pci/cmipci.c')
| -rw-r--r-- | sound/pci/cmipci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 1a74ca62c314..c7899c32aba1 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
| @@ -3272,9 +3272,9 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci, | |||
| 3272 | return -ENOENT; | 3272 | return -ENOENT; |
| 3273 | } | 3273 | } |
| 3274 | 3274 | ||
| 3275 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 3275 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 3276 | if (card == NULL) | 3276 | if (err < 0) |
| 3277 | return -ENOMEM; | 3277 | return err; |
| 3278 | 3278 | ||
| 3279 | switch (pci->device) { | 3279 | switch (pci->device) { |
| 3280 | case PCI_DEVICE_ID_CMEDIA_CM8738: | 3280 | case PCI_DEVICE_ID_CMEDIA_CM8738: |