summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolai Zeldovich <nickolai@csail.mit.edu>2013-01-05 20:14:08 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-07 09:33:56 +0100
commit61ed1dca1645d2dd64c83a01f728dfd59fa789b6 (patch)
treee5d9193fa34153055f033be06261733426c25903
parentsound: oss/pas2: Fix possible access out of array (diff)
downloadlinux-61ed1dca1645d2dd64c83a01f728dfd59fa789b6.tar.xz
linux-61ed1dca1645d2dd64c83a01f728dfd59fa789b6.zip
ALSA: au88x0: fix incorrect left shift
vortex_wt_setdsout performs bit-negation on the bit position (wt&0x1f) rather than on the resulting bitmask. This code is never actually invoked (vortex_wt_setdsout is always called with en=1), so this does not currently cause any problem, and this patch is simply cleanup. Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/au88x0/au88x0_synth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/au88x0/au88x0_synth.c b/sound/pci/au88x0/au88x0_synth.c
index 2805e34bd41d..8bef47311e45 100644
--- a/sound/pci/au88x0/au88x0_synth.c
+++ b/sound/pci/au88x0/au88x0_synth.c
@@ -58,7 +58,7 @@ static void vortex_wt_setdsout(vortex_t * vortex, u32 wt, int en)
if (en)
temp |= (1 << (wt & 0x1f));
else
- temp &= (1 << ~(wt & 0x1f));
+ temp &= ~(1 << (wt & 0x1f));
hwwrite(vortex->mmio, WT_DSREG((wt >= 0x20) ? 1 : 0), temp);
}