]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: oxygen: change || to &&
authorClemens Ladisch <clemens@ladisch.de>
Wed, 3 Mar 2010 08:16:18 +0000 (09:16 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 3 Mar 2010 21:39:31 +0000 (22:39 +0100)
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>
sound/pci/oxygen/xonar_wm87x6.c

index 7754db166d9ec1a0be80e4b3db1fdbde994ff42e..dbc4b89d74e43ffa3311af7c9386fb5aae38d9a9 100644 (file)
@@ -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;
        }