Commit 74a0094c authored by Ondrej Zary's avatar Ondrej Zary Committed by Takashi Iwai

ALSA: cmi8330: revert comments about AD1848 back

In ALSA 1.0.20, the comments were changed to say CMI8330 instead of AD1848.
The CMI8330 chip includes two codecs - AD1848 and SB16, so the comments were
correct and are misleading now. Revert them back.
Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c2a30d71
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
* *
* This card has two mixers and two PCM devices. I've cheesed it such * This card has two mixers and two PCM devices. I've cheesed it such
* that recording and playback can be done through the same device. * that recording and playback can be done through the same device.
* The driver "magically" routes the capturing to the CMI8330 codec, * The driver "magically" routes the capturing to the AD1848 codec,
* and playback to the SB16 codec. This allows for full-duplex mode * and playback to the SB16 codec. This allows for full-duplex mode
* to some extent. * to some extent.
* The utilities in alsa-utils are aware of both devices, so passing * The utilities in alsa-utils are aware of both devices, so passing
...@@ -345,7 +345,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, ...@@ -345,7 +345,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
err = pnp_activate_dev(pdev); err = pnp_activate_dev(pdev);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "CMI8330/C3D PnP configure failure\n"); snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP configure failure\n");
return -EBUSY; return -EBUSY;
} }
wssport[dev] = pnp_port_start(pdev, 0); wssport[dev] = pnp_port_start(pdev, 0);
...@@ -527,11 +527,11 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) ...@@ -527,11 +527,11 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
wssdma[dev], -1, wssdma[dev], -1,
WSS_HW_DETECT, 0, &acard->wss); WSS_HW_DETECT, 0, &acard->wss);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR PFX "(CMI8330) device busy??\n"); snd_printk(KERN_ERR PFX "(AD1848) device busy??\n");
return err; return err;
} }
if (acard->wss->hardware != WSS_HW_CMI8330) { if (acard->wss->hardware != WSS_HW_CMI8330) {
snd_printk(KERN_ERR PFX "(CMI8330) not found during probe\n"); snd_printk(KERN_ERR PFX "(AD1848) not found during probe\n");
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment