Commit 29dab4fd authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine

Also add a little code cleanup.
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent da2436a2
...@@ -2689,7 +2689,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) ...@@ -2689,7 +2689,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
} }
ichdev = &chip->ichd[ICHD_PCMOUT]; ichdev = &chip->ichd[ICHD_PCMOUT];
ichdev->physbuf = subs->dma_buffer.addr; ichdev->physbuf = subs->dma_buffer.addr;
ichdev->size = chip->ichd[ICHD_PCMOUT].fragsize = INTEL8X0_TESTBUF_SIZE; ichdev->size = ichdev->fragsize = INTEL8X0_TESTBUF_SIZE;
ichdev->substream = NULL; /* don't process interrupts */ ichdev->substream = NULL; /* don't process interrupts */
/* set rate */ /* set rate */
...@@ -2766,10 +2766,10 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) ...@@ -2766,10 +2766,10 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip)
if (pos < 40000 || pos >= 60000) if (pos < 40000 || pos >= 60000)
/* abnormal value. hw problem? */ /* abnormal value. hw problem? */
printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos); printk(KERN_INFO "intel8x0: measured clock %ld rejected\n", pos);
else if (pos > 40500 || pos < 41500) else if (pos > 40500 && pos < 41500)
/* first exception - 41000Hz reference clock */ /* first exception - 41000Hz reference clock */
chip->ac97_bus->clock = 41000; chip->ac97_bus->clock = 41000;
else if (pos > 43600 || pos < 44600) else if (pos > 43600 && pos < 44600)
/* second exception - 44100HZ reference clock */ /* second exception - 44100HZ reference clock */
chip->ac97_bus->clock = 44100; chip->ac97_bus->clock = 44100;
else if (pos < 47500 || pos > 48500) else if (pos < 47500 || pos > 48500)
......
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