summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-03-03 09:16:18 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-03 22:39:31 +0100
commitfaf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8 (patch)
tree8de16dc89b7bd233cbf7b59c716f8e80866215e7 /sound
parentfd8d47351d2e241f3168eeb697ce55cc28c75b78 (diff)
downloadlinux-faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8.tar.gz
linux-faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8.tar.bz2
linux-faf4eb23d5fcb9a4728766a1e7bce9c6f2b43bd8.zip
ALSA: oxygen: change || to &&
In the original code the condition was always true (hopefully) because WM8776_HPLVOL is zero. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/xonar_wm87x6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 7754db166d9e..dbc4b89d74e4 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;
}