Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits)
  [ALSA] version 1.0.15
  [ALSA] Fix thinko in cs4231 mce down check
  [ALSA] sun-cs4231: improved waiting after MCE down
  [ALSA] sun-cs4231: use cs4231-regs.h
  [ALSA] This simplifies and fixes waiting loops of the mce_down()
  [ALSA] This patch adds support for a wavetable chip on
  [ALSA] This patch removes open_mutex from the ad1848-lib as
  [ALSA] fix bootup crash in snd_gus_interrupt()
  [ALSA] hda-codec - Fix SKU ID function for realtek codecs
  [ALSA] Support  ASUS P701 eeepc [0x1043 0x82a1] support
  [ALSA] hda-codec - Add array terminator for dmic in STAC codec
  [ALSA] hdsp - Fix zero division
  [ALSA] usb-audio - Fix double comment
  [ALSA] hda-codec - Fix STAC922x volume knob control
  [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
  [ALSA] hda-codec - Fix for Fujitsu Lifebook C1410
  [ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
  [ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command
  [ALSA] via82xx - Add DXS quirk for Shuttle AK31v2
  [ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx
  ...

1 files changed, 25 insertions, 3 deletions

diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c
index 3acd12db6952..a1de0c608957 100644
--- a/sound/usb/caiaq/caiaq-input.c
+++ b/sound/usb/caiaq/caiaq-input.c
@@ -34,6 +34,8 @@
 static unsigned char keycode_ak1[] =  { KEY_C, KEY_B, KEY_A };
 static unsigned char keycode_rk2[] =  { KEY_1, KEY_2, KEY_3, KEY_4, 
                                         KEY_5, KEY_6, KEY_7 };
+static unsigned char keycode_rk3[] =  { KEY_1, KEY_2, KEY_3, KEY_4,
+                                        KEY_5, KEY_6, KEY_7, KEY_5, KEY_6 };
 
 #define DEG90  (range/2)
 #define DEG180 (range)
@@ -107,7 +109,8 @@ static unsigned int decode_erp(unsigned char a, unsigned char b)
 
 
 static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev, 
-                                        const char *buf, unsigned int len)
+                                        const unsigned char *buf,
+                                        unsigned int len)
 {
         switch(dev->input_dev->id.product) {
         case USB_PID_RIGKONTROL2:
@@ -116,6 +119,12 @@ static void snd_caiaq_input_read_analog(struct snd_usb_caiaqdev *dev,
                 input_report_abs(dev->input_dev, ABS_Z, (buf[2] << 8) |buf[3]);
                 input_sync(dev->input_dev);
                 break;
+        case USB_PID_RIGKONTROL3:
+                input_report_abs(dev->input_dev, ABS_X, (buf[0] << 8) |buf[1]);
+                input_report_abs(dev->input_dev, ABS_Y, (buf[2] << 8) |buf[3]);
+                input_report_abs(dev->input_dev, ABS_Z, (buf[4] << 8) |buf[5]);
+                input_sync(dev->input_dev);
+                break;
         }
 }
 
@@ -128,7 +137,7 @@ static void snd_caiaq_input_read_erp(struct snd_usb_caiaqdev *dev,
         case USB_PID_AK1:
                 i = decode_erp(buf[0], buf[1]);
                 input_report_abs(dev->input_dev, ABS_X, i);
-                input_sync(dev->input_dev);     
+                input_sync(dev->input_dev);
                 break;
         }
 }
@@ -204,6 +213,20 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
                 input_set_abs_params(input, ABS_Z, 0, 4096, 0, 10);
                 snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
                 break;
+        case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL3):
+                input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
+                input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z);
+                input->keycode = keycode_rk3;
+                input->keycodesize = sizeof(char);
+                input->keycodemax = ARRAY_SIZE(keycode_rk3);
+                for (i=0; i<ARRAY_SIZE(keycode_rk3); i++)
+                        set_bit(keycode_rk3[i], input->keybit);
+
+                input_set_abs_params(input, ABS_X, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Y, 0, 1024, 0, 10);
+                input_set_abs_params(input, ABS_Z, 0, 1024, 0, 10);
+                snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
+                break;
         case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
                 input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
                 input->absbit[0] = BIT(ABS_X);
@@ -238,7 +261,6 @@ void snd_usb_caiaq_input_free(struct snd_usb_caiaqdev *dev)
                 return;
 
         input_unregister_device(dev->input_dev);
-        input_free_device(dev->input_dev);
         dev->input_dev = NULL;
 }