* [patch] oxygen: change || to &&
@ 2010-03-03 7:08 Dan Carpenter
2010-03-03 8:58 ` [alsa-devel] " Clemens Ladisch
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2010-03-03 7:08 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: Takashi Iwai, Clemens Ladisch, alsa-devel, linux-kernel,
kernel-janitors
In the original code the condition was always true (hopefully) because
WM8776_HPLVOL is zero.
Signed-off-by: Dan Carpenter <error27@gmail.com>
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;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [alsa-devel] [patch] oxygen: change || to &&
2010-03-03 7:08 [patch] oxygen: change || to && Dan Carpenter
@ 2010-03-03 8:58 ` Clemens Ladisch
0 siblings, 0 replies; 2+ messages in thread
From: Clemens Ladisch @ 2010-03-03 8:58 UTC (permalink / raw)
To: Dan Carpenter, Jaroslav Kysela, Takashi Iwai, alsa-devel,
linux-kernel, kernel-janitors
Dan Carpenter wrote:
> In the original code the condition was always true (hopefully) because
> WM8776_HPLVOL is zero.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
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;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-03 8:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-03 7:08 [patch] oxygen: change || to && Dan Carpenter
2010-03-03 8:58 ` [alsa-devel] " Clemens Ladisch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox