aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/caiaq/caiaq-input.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/caiaq/caiaq-input.c b/sound/usb/caiaq/caiaq-input.c
index a1de0c608957..cd536ca20e56 100644
--- a/sound/usb/caiaq/caiaq-input.c
+++ b/sound/usb/caiaq/caiaq-input.c
@@ -200,8 +200,9 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
200 200
201 switch (dev->chip.usb_id) { 201 switch (dev->chip.usb_id) {
202 case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2): 202 case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_RIGKONTROL2):
203 input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); 203 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
204 input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_Z); 204 input->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) |
205 BIT_MASK(ABS_Z);
205 input->keycode = keycode_rk2; 206 input->keycode = keycode_rk2;
206 input->keycodesize = sizeof(char); 207 input->keycodesize = sizeof(char);
207 input->keycodemax = ARRAY_SIZE(keycode_rk2); 208 input->keycodemax = ARRAY_SIZE(keycode_rk2);
@@ -228,8 +229,8 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
228 snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0); 229 snd_usb_caiaq_set_auto_msg(dev, 1, 10, 0);
229 break; 230 break;
230 case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1): 231 case USB_ID(USB_VID_NATIVEINSTRUMENTS, USB_PID_AK1):
231 input->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); 232 input->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
232 input->absbit[0] = BIT(ABS_X); 233 input->absbit[0] = BIT_MASK(ABS_X);
233 input->keycode = keycode_ak1; 234 input->keycode = keycode_ak1;
234 input->keycodesize = sizeof(char); 235 input->keycodesize = sizeof(char);
235 input->keycodemax = ARRAY_SIZE(keycode_ak1); 236 input->keycodemax = ARRAY_SIZE(keycode_ak1);