diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2009-06-27 10:26:35 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-06-29 02:06:57 -0400 |
commit | 74a0094cd9d030d7a684e6ce1cbd1658eb63bd7d (patch) | |
tree | 8a57c4baf526995554a37625c10537d41a9536f7 /sound/isa | |
parent | c2a30d711852e4f39c8a79135b3caa701f7a8e02 (diff) |
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: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/cmi8330.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 3ee0269e5bd0..d510c76c537f 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c | |||
@@ -35,7 +35,7 @@ | |||
35 | * | 35 | * |
36 | * This card has two mixers and two PCM devices. I've cheesed it such | 36 | * This card has two mixers and two PCM devices. I've cheesed it such |
37 | * that recording and playback can be done through the same device. | 37 | * that recording and playback can be done through the same device. |
38 | * The driver "magically" routes the capturing to the CMI8330 codec, | 38 | * The driver "magically" routes the capturing to the AD1848 codec, |
39 | * and playback to the SB16 codec. This allows for full-duplex mode | 39 | * and playback to the SB16 codec. This allows for full-duplex mode |
40 | * to some extent. | 40 | * to some extent. |
41 | * The utilities in alsa-utils are aware of both devices, so passing | 41 | * 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 | 345 | ||
346 | err = pnp_activate_dev(pdev); | 346 | err = pnp_activate_dev(pdev); |
347 | if (err < 0) { | 347 | if (err < 0) { |
348 | snd_printk(KERN_ERR "CMI8330/C3D PnP configure failure\n"); | 348 | snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP configure failure\n"); |
349 | return -EBUSY; | 349 | return -EBUSY; |
350 | } | 350 | } |
351 | wssport[dev] = pnp_port_start(pdev, 0); | 351 | wssport[dev] = pnp_port_start(pdev, 0); |
@@ -527,11 +527,11 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) | |||
527 | wssdma[dev], -1, | 527 | wssdma[dev], -1, |
528 | WSS_HW_DETECT, 0, &acard->wss); | 528 | WSS_HW_DETECT, 0, &acard->wss); |
529 | if (err < 0) { | 529 | if (err < 0) { |
530 | snd_printk(KERN_ERR PFX "(CMI8330) device busy??\n"); | 530 | snd_printk(KERN_ERR PFX "(AD1848) device busy??\n"); |
531 | return err; | 531 | return err; |
532 | } | 532 | } |
533 | if (acard->wss->hardware != WSS_HW_CMI8330) { | 533 | if (acard->wss->hardware != WSS_HW_CMI8330) { |
534 | snd_printk(KERN_ERR PFX "(CMI8330) not found during probe\n"); | 534 | snd_printk(KERN_ERR PFX "(AD1848) not found during probe\n"); |
535 | return -ENODEV; | 535 | return -ENODEV; |
536 | } | 536 | } |
537 | 537 | ||