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/isa/es1688/es1688.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/isa/es1688/es1688.c')
| -rw-r--r-- | sound/isa/es1688/es1688.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index b46377139cf8..d746750410ea 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c | |||
| @@ -122,9 +122,9 @@ static int __devinit snd_es1688_probe(struct device *dev, unsigned int n) | |||
| 122 | struct snd_pcm *pcm; | 122 | struct snd_pcm *pcm; |
| 123 | int error; | 123 | int error; |
| 124 | 124 | ||
| 125 | card = snd_card_new(index[n], id[n], THIS_MODULE, 0); | 125 | error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); |
| 126 | if (!card) | 126 | if (error < 0) |
| 127 | return -EINVAL; | 127 | return error; |
| 128 | 128 | ||
| 129 | error = snd_es1688_legacy_create(card, dev, n, &chip); | 129 | error = snd_es1688_legacy_create(card, dev, n, &chip); |
| 130 | if (error < 0) | 130 | if (error < 0) |