Skip to contentSkip to conversation

oxygen: change || to &&

PATCH In review Dan Carpenter 2 participants 2 messages Mar 3, 2010

Subsystems (3)
Sound Kernel janitors C-media CMI8788 driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 oxygen: change || to &&

In the original code the condition was always true (hopefully) because WM8776_HPLVOL is zero.

Signed-off-by Dan Carpenter <[email protected]>
sound/pci/oxygen/xonar_wm87x6.c +1 -1
index 7754db1..dbc4b89 100644
@@ -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;
 	}
maintainer
#1 lore raw
Quoted 4 lines · Dan Carpenter

In the original code the condition was always true (hopefully) because WM8776_HPLVOL is zero.

Signed-off-by Dan Carpenter <[email protected]>

Thanks; applied.

Quoted 13 lines
sound/pci/oxygen/xonar_wm87x6.c +1 -1
index 7754db1..dbc4b89 100644
@@ -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;
 	}