diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-28 02:08:32 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-28 02:08:32 -0500 |
| commit | 67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (patch) | |
| tree | 3c48fabced8e519ef3f83209a793dfea48dbbfa8 /sound/pci/ymfpci/ymfpci.c | |
| parent | 006f367e38fb45e2f161c0f500c74449ae63e866 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/asoc
Conflicts:
sound/soc/soc-core.c
Diffstat (limited to 'sound/pci/ymfpci/ymfpci.c')
| -rw-r--r-- | sound/pci/ymfpci/ymfpci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c index 2631a554845e..4af66661f9b0 100644 --- a/sound/pci/ymfpci/ymfpci.c +++ b/sound/pci/ymfpci/ymfpci.c | |||
| @@ -187,9 +187,9 @@ static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci, | |||
| 187 | return -ENOENT; | 187 | return -ENOENT; |
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 190 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 191 | if (card == NULL) | 191 | if (err < 0) |
| 192 | return -ENOMEM; | 192 | return err; |
| 193 | 193 | ||
| 194 | switch (pci_id->device) { | 194 | switch (pci_id->device) { |
| 195 | case 0x0004: str = "YMF724"; model = "DS-1"; break; | 195 | case 0x0004: str = "YMF724"; model = "DS-1"; break; |