diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 03:52:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 03:52:49 +0200 |
| commit | 7c5814c7199851c5fe9395d08fc1ab3c8c1531ea (patch) | |
| tree | 66cc9080e47c0be8bd9d4530626e54c77f9895ed /sound/oss | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ALSA: usb-audio: automatically detect feedback format (diff) | |
| download | linux-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.tar.xz linux-7c5814c7199851c5fe9395d08fc1ab3c8c1531ea.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: usb-audio: automatically detect feedback format
ASoC: sound/wm9090: add missing __devexit marker
ASoC: sound/max98088: add missing __devexit marker
ASoC: sound/ad73311: add missing __devexit marker
ASoC: fsl - fix build error in pcm030-audio-fabric.c
sound/oss/sb_ess.c: delete double assignment
ALSA: hda - Change BTL amp level on some HP notebooks
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/sb_ess.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c index 51a3d381a59e..9890cf2066ff 100644 --- a/sound/oss/sb_ess.c +++ b/sound/oss/sb_ess.c @@ -1722,7 +1722,6 @@ printk (KERN_INFO "FKS: es_rec_set_recmask mask = %x\n", mask); right = (value & 0x0000ff00) >> 8; } else { /* Turn it off (3) */ left = 0; - left = 0; right = 0; } sb_common_mixer_set(devc, i + ES_REC_MIXER_RECDIFF, left, right); |