aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/opti9xx/opti92x-ad1848.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/opti9xx/opti92x-ad1848.c')
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 1f6d6fcd6e57..4f172a219244 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -757,6 +757,15 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
757 error = snd_wss_pcm(codec, 0, &pcm); 757 error = snd_wss_pcm(codec, 0, &pcm);
758 if (error < 0) 758 if (error < 0)
759 return error; 759 return error;
760#else
761 error = snd_ad1848_create(card, chip->wss_base + 4, chip->irq,
762 chip->dma1, WSS_HW_DETECT, &codec);
763 if (error < 0)
764 return error;
765 error = snd_ad1848_pcm(codec, 0, &pcm);
766 if (error < 0)
767 return error;
768#endif
760 error = snd_wss_mixer(codec); 769 error = snd_wss_mixer(codec);
761 if (error < 0) 770 if (error < 0)
762 return error; 771 return error;
@@ -764,7 +773,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
764 error = snd_wss_timer(codec, 0, &timer); 773 error = snd_wss_timer(codec, 0, &timer);
765 if (error < 0) 774 if (error < 0)
766 return error; 775 return error;
767#else /* OPTI93X */ 776#endif
777#ifdef OPTi93X
768 error = request_irq(chip->irq, snd_opti93x_interrupt, 778 error = request_irq(chip->irq, snd_opti93x_interrupt,
769 IRQF_DISABLED, DEV_NAME" - WSS", codec); 779 IRQF_DISABLED, DEV_NAME" - WSS", codec);
770 if (error < 0) { 780 if (error < 0) {
@@ -772,16 +782,6 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
772 return error; 782 return error;
773 } 783 }
774#endif 784#endif
775#else
776 if ((error = snd_ad1848_create(card, chip->wss_base + 4,
777 chip->irq, chip->dma1,
778 WSS_HW_DETECT, &codec)) < 0)
779 return error;
780 if ((error = snd_ad1848_pcm(codec, 0, &pcm)) < 0)
781 return error;
782 if ((error = snd_ad1848_mixer(codec)) < 0)
783 return error;
784#endif
785 strcpy(card->driver, chip->name); 785 strcpy(card->driver, chip->name);
786 sprintf(card->shortname, "OPTi %s", card->driver); 786 sprintf(card->shortname, "OPTi %s", card->driver);
787#if defined(CS4231) || defined(OPTi93X) 787#if defined(CS4231) || defined(OPTi93X)