Re: [alsa-devel] [patch] oxygen: change || to &&

From: Clemens Ladisch
Date: Wed Mar 03 2010 - 03:58:20 EST


Dan Carpenter wrote:
> In the original code the condition was always true (hopefully) because
> WM8776_HPLVOL is zero.
>
> Signed-off-by: Dan Carpenter <error27@xxxxxxxxx>

Thanks; applied.

> diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
> index 7754db1..dbc4b89 100644
> --- a/sound/pci/oxygen/xonar_wm87x6.c
> +++ b/sound/pci/oxygen/xonar_wm87x6.c
> @@ -68,7 +68,7 @@ static void wm8776_write(struct oxygen *chip,
> OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
> (reg << 9) | value);
> if (reg < ARRAY_SIZE(data->wm8776_regs)) {
> - if (reg >= WM8776_HPLVOL || reg <= WM8776_DACMASTER)
> + if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER)
> value &= ~WM8776_UPDATE;
> data->wm8776_regs[reg] = value;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/