aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/intel8x0.c
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-04-14 16:40:04 -0400
committerJaroslav Kysela <perex@perex.cz>2009-04-14 16:40:04 -0400
commit29dab4fd3176e25dfab6cd763beb02d87973c288 (patch)
tree23a59747d00681e0064b03d4f00f6148aeb9dd6d /sound/pci/intel8x0.c
parentda2436a23c038055b1da6fe30b6ea2886b1e07b0 (diff)
[ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine
Also add a little code cleanup. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/intel8x0.c')
-rw-r--r--sound/pci/intel8x0.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 6962f94d1bea..10f8609e9c6e 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2689,7 +2689,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
2689 } 2689 }
2690 ichdev = &chip->ichd[ICHD_PCMOUT]; 2690 ichdev = &chip->ichd[ICHD_PCMOUT];
2691 ichdev->physbuf = subs->dma_buffer.addr; 2691 ichdev->physbuf = subs->dma_buffer.addr;
2692 ichdev->size = chip->ichd[ICHD_PCMOUT].fragsize = INTEL8X0_TESTBUF_SIZE; 2692 ichdev->size = ichdev->fragsize = INTEL8X0_TESTBUF_SIZE;
2693 ichdev->substream = NULL; /* don't process interrupts */ 2693 ichdev->substream = NULL; /* don't process interrupts */
2694 2694
2695 /* set rate */ 2695 /* set rate */
@@ -2766,10 +2766,10 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
2766 if (pos < 40000 || pos >= 60000) 2766 if (pos < 40000 || pos >= 60000)
2767 /* abnormal value. hw problem? */ 2767 /* abnormal value. hw problem? */
2768 printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos); 2768 printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos);
2769 else if (pos > 40500 || pos < 41500) 2769 else if (pos > 40500 && pos < 41500)
2770 /* first exception - 41000Hz reference clock */ 2770 /* first exception - 41000Hz reference clock */
2771 chip->ac97_bus->clock = 41000; 2771 chip->ac97_bus->clock = 41000;
2772 else if (pos > 43600 || pos < 44600) 2772 else if (pos > 43600 && pos < 44600)
2773 /* second exception - 44100HZ reference clock */ 2773 /* second exception - 44100HZ reference clock */
2774 chip->ac97_bus->clock = 44100; 2774 chip->ac97_bus->clock = 44100;
2775 else if (pos < 47500 || pos > 48500) 2775 else if (pos < 47500 || pos > 48500)