aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cmi8330.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-07-31 15:05:44 -0400
committerJaroslav Kysela <perex@perex.cz>2008-08-06 09:39:51 -0400
commitece11c9b6db5b96179df8eb9cdc54c78953a4c0f (patch)
tree21c5ebf03d9750fc1c4a4551f84031e969e422b8 /sound/isa/cmi8330.c
parent241b3ee70d2d69e88d5c144ce938b1887cd6d3fc (diff)
ALSA: wss_lib: use wss constants instead of ad1848 ones
Use wss constants for mode. Move ad1848 hardware constants to the wss.h. Move mixer tlv macros into the ad1848_lib.c from the ad1848.h. Drop the MODE_RUNNING spurious IRQ guard on AD1848 as it doesn not seem to be needed. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Reviewed-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/isa/cmi8330.c')
-rw-r--r--sound/isa/cmi8330.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index aefd2f4a0572..af6ba129910e 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -465,12 +465,12 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
465 wssport[dev] + 4, 465 wssport[dev] + 4,
466 wssirq[dev], 466 wssirq[dev],
467 wssdma[dev], 467 wssdma[dev],
468 AD1848_HW_DETECT, 468 WSS_HW_DETECT,
469 &acard->wss)) < 0) { 469 &acard->wss)) < 0) {
470 snd_printk(KERN_ERR PFX "(AD1848) device busy??\n"); 470 snd_printk(KERN_ERR PFX "(AD1848) device busy??\n");
471 return err; 471 return err;
472 } 472 }
473 if (acard->wss->hardware != AD1848_HW_CMI8330) { 473 if (acard->wss->hardware != WSS_HW_CMI8330) {
474 snd_printk(KERN_ERR PFX "(AD1848) not found during probe\n"); 474 snd_printk(KERN_ERR PFX "(AD1848) not found during probe\n");
475 return -ENODEV; 475 return -ENODEV;
476 } 476 }