diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 15:41:25 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-26 15:41:25 (GMT) |
| commit | 2214482cb00e6da1397c2ecde5b392490eb9637f (patch) | |
| tree | 7375817fa8b76741a0e362716b59860255e526ba /sound/usb/caiaq/input.c | |
| parent | 13da9e200fe4740b02cd51e07ab454627e228920 (diff) | |
| parent | d21921215af2fe33190a3b5b166b145e607e537d (diff) | |
| download | linux-fsl-qoriq-2214482cb00e6da1397c2ecde5b392490eb9637f.tar.xz | |
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: emu10k1: allow high-resolution mixer controls
ALSA: pcm: fix delta calculation at boundary wraparound
ALSA: hda_intel: fix handling of non-completion stream interrupts
ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis
ALSA: hda: Fix model quirk for Dell M1730
ALSA: hda - iMac9,1 sound fixes
ALSA: hda: Use LPIB for Toshiba A100-259
ALSA: hda: Use LPIB for Acer Aspire 5110
ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
ALSA: usb-audio: add support for Akai MPD16
ALSA: pcm: fix the fix of the runtime->boundary calculation
Diffstat (limited to 'sound/usb/caiaq/input.c')
| -rw-r--r-- | sound/usb/caiaq/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c index 8bbfbfd..dcb6207 100644 --- a/sound/usb/caiaq/input.c +++ b/sound/usb/caiaq/input.c @@ -171,7 +171,7 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, input_report_abs(input_dev, ABS_HAT0Y, (buf[4] << 8) | buf[5]); input_report_abs(input_dev, ABS_HAT1X, (buf[12] << 8) | buf[13]); input_report_abs(input_dev, ABS_HAT1Y, (buf[2] << 8) | buf[3]); - input_report_abs(input_dev, ABS_HAT2X, (buf[15] << 8) | buf[15]); + input_report_abs(input_dev, ABS_HAT2X, (buf[14] << 8) | buf[15]); input_report_abs(input_dev, ABS_HAT2Y, (buf[0] << 8) | buf[1]); input_report_abs(input_dev, ABS_HAT3X, (buf[10] << 8) | buf[11]); input_report_abs(input_dev, ABS_HAT3Y, (buf[6] << 8) | buf[7]); |