ALSA: snd-usb-caiaq: Fix LED commands for Kore controller
Subsystems (2)
PATCH 1/1 ALSA: snd-usb-caiaq: Fix LED commands for Kore controller
KoreController and KoreController2 need an EP1_CMD_DIMM_LEDS command to set their LEDs, not EP1_CMD_WRITE_IO.
---
This bug is acutally ancient, but given that nobody actually noticed it for so long makes me believe it's not worth flagging the patch for stable@. Still, it would be good to have it for 3.17.
Thanks,
Daniel
sound/usb/caiaq/control.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
sound/usb/caiaq/control.c +11 -7
@@ -100,15 +100,19 @@ static int control_put(struct snd_kcontrol *kcontrol,struct snd_usb_caiaqdev *cdev =caiaqdev (chip->card);int pos = kcontrol->private_value;int v = ucontrol->value.integer.value[0 ]; -unsigned char cmd =EP1_CMD_WRITE_IO ; +unsigned char cmd; -if (cdev->chip.usb_id == -USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_TRAKTORKONTROLX1 )) - cmd =EP1_CMD_DIMM_LEDS ; - -if (cdev->chip.usb_id == -USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_MASCHINECONTROLLER )) +switch (cdev->chip.usb_id) { +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_MASCHINECONTROLLER ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_TRAKTORKONTROLX1 ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_KORECONTROLLER2 ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_KORECONTROLLER ): cmd =EP1_CMD_DIMM_LEDS ; +break ; +default : + cmd =EP1_CMD_WRITE_IO ; +break ; + }if (pos &CNT_INTVAL ) {int i = pos & ~CNT_INTVAL ;
Signature · 1 line
2.1.0
At Sun, 21 Sep 2014 23:55:38 +0200,
Quoted 10 lines · Daniel Mack
KoreController and KoreController2 need an
EP1_CMD_DIMM_LEDScommand to set their LEDs, notEP1_CMD_WRITE_IO.Signed-off-by Daniel Mack <[email protected]>Reported-and-tested-by Brad Wilson <[email protected]>---
This bug is acutally ancient, but given that nobody actually noticed it for so long makes me believe it's not worth flagging the patch for stable@. Still, it would be good to have it for 3.17.
OK, applied to for-linus branch now.
thanks,
Takashi
Quoted 41 lines
Thanks,
Danielsound/usb/caiaq/control.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)sound/usb/caiaq/control.c +11
-7@@ -100,15 +100,19 @@ static int control_put(struct snd_kcontrol *kcontrol,struct snd_usb_caiaqdev *cdev =caiaqdev (chip->card);int pos = kcontrol->private_value;int v = ucontrol->value.integer.value[0 ]; -unsigned char cmd =EP1_CMD_WRITE_IO ; +unsigned char cmd; -if (cdev->chip.usb_id == -USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_TRAKTORKONTROLX1 )) - cmd =EP1_CMD_DIMM_LEDS ; - -if (cdev->chip.usb_id == -USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_MASCHINECONTROLLER )) +switch (cdev->chip.usb_id) { +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_MASCHINECONTROLLER ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_TRAKTORKONTROLX1 ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_KORECONTROLLER2 ): +case USB_ID (USB_VID_NATIVEINSTRUMENTS ,USB_PID_KORECONTROLLER ): cmd =EP1_CMD_DIMM_LEDS ; +break ; +default : + cmd =EP1_CMD_WRITE_IO ; +break ; + }if (pos &CNT_INTVAL ) {int i = pos & ~CNT_INTVAL ;Signature · 1 line
2.1.0