diff options
Diffstat (limited to 'sound/isa/opti9xx/miro.c')
-rw-r--r-- | sound/isa/opti9xx/miro.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 59f7c55baf30..4641daa7844d 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c | |||
@@ -1221,7 +1221,7 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) | |||
1221 | 1221 | ||
1222 | int error; | 1222 | int error; |
1223 | struct snd_miro *miro; | 1223 | struct snd_miro *miro; |
1224 | struct snd_cs4231 *codec; | 1224 | struct snd_wss *codec; |
1225 | struct snd_timer *timer; | 1225 | struct snd_timer *timer; |
1226 | struct snd_card *card; | 1226 | struct snd_card *card; |
1227 | struct snd_pcm *pcm; | 1227 | struct snd_pcm *pcm; |
@@ -1310,29 +1310,32 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) | |||
1310 | } | 1310 | } |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | if ((error = snd_miro_configure(miro))) { | 1313 | error = snd_miro_configure(miro); |
1314 | if (error) { | ||
1314 | snd_card_free(card); | 1315 | snd_card_free(card); |
1315 | return error; | 1316 | return error; |
1316 | } | 1317 | } |
1317 | 1318 | ||
1318 | if ((error = snd_cs4231_create(card, miro->wss_base + 4, -1, | 1319 | error = snd_wss_create(card, miro->wss_base + 4, -1, |
1319 | miro->irq, miro->dma1, miro->dma2, | 1320 | miro->irq, miro->dma1, miro->dma2, |
1320 | CS4231_HW_AD1845, | 1321 | WSS_HW_AD1845, 0, &codec); |
1321 | 0, | 1322 | if (error < 0) { |
1322 | &codec)) < 0) { | ||
1323 | snd_card_free(card); | 1323 | snd_card_free(card); |
1324 | return error; | 1324 | return error; |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | if ((error = snd_cs4231_pcm(codec, 0, &pcm)) < 0) { | 1327 | error = snd_wss_pcm(codec, 0, &pcm); |
1328 | if (error < 0) { | ||
1328 | snd_card_free(card); | 1329 | snd_card_free(card); |
1329 | return error; | 1330 | return error; |
1330 | } | 1331 | } |
1331 | if ((error = snd_cs4231_mixer(codec)) < 0) { | 1332 | error = snd_wss_mixer(codec); |
1333 | if (error < 0) { | ||
1332 | snd_card_free(card); | 1334 | snd_card_free(card); |
1333 | return error; | 1335 | return error; |
1334 | } | 1336 | } |
1335 | if ((error = snd_cs4231_timer(codec, 0, &timer)) < 0) { | 1337 | error = snd_wss_timer(codec, 0, &timer); |
1338 | if (error < 0) { | ||
1336 | snd_card_free(card); | 1339 | snd_card_free(card); |
1337 | return error; | 1340 | return error; |
1338 | } | 1341 | } |