diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/pci/es1938.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/es1938.c')
| -rw-r--r-- | sound/pci/es1938.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 4cd9a1faaecc..34a78afc26d0 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c | |||
| @@ -1799,9 +1799,9 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci, | |||
| 1799 | return -ENOENT; | 1799 | return -ENOENT; |
| 1800 | } | 1800 | } |
| 1801 | 1801 | ||
| 1802 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 1802 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 1803 | if (card == NULL) | 1803 | if (err < 0) |
| 1804 | return -ENOMEM; | 1804 | return err; |
| 1805 | for (idx = 0; idx < 5; idx++) { | 1805 | for (idx = 0; idx < 5; idx++) { |
| 1806 | if (pci_resource_start(pci, idx) == 0 || | 1806 | if (pci_resource_start(pci, idx) == 0 || |
| 1807 | !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) { | 1807 | !(pci_resource_flags(pci, idx) & IORESOURCE_IO)) { |