diff options
Diffstat (limited to 'sound/usb/mixer_quirks.c')
-rw-r--r-- | sound/usb/mixer_quirks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 3d0f4873112b..ab125ee0b0f0 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c | |||
@@ -190,18 +190,18 @@ static int snd_audigy2nx_led_put(struct snd_kcontrol *kcontrol, struct snd_ctl_e | |||
190 | err = snd_usb_ctl_msg(mixer->chip->dev, | 190 | err = snd_usb_ctl_msg(mixer->chip->dev, |
191 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, | 191 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, |
192 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, | 192 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
193 | !value, 0, NULL, 0, 100); | 193 | !value, 0, NULL, 0); |
194 | /* USB X-Fi S51 Pro */ | 194 | /* USB X-Fi S51 Pro */ |
195 | if (mixer->chip->usb_id == USB_ID(0x041e, 0x30df)) | 195 | if (mixer->chip->usb_id == USB_ID(0x041e, 0x30df)) |
196 | err = snd_usb_ctl_msg(mixer->chip->dev, | 196 | err = snd_usb_ctl_msg(mixer->chip->dev, |
197 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, | 197 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, |
198 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, | 198 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
199 | !value, 0, NULL, 0, 100); | 199 | !value, 0, NULL, 0); |
200 | else | 200 | else |
201 | err = snd_usb_ctl_msg(mixer->chip->dev, | 201 | err = snd_usb_ctl_msg(mixer->chip->dev, |
202 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, | 202 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x24, |
203 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, | 203 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
204 | value, index + 2, NULL, 0, 100); | 204 | value, index + 2, NULL, 0); |
205 | if (err < 0) | 205 | if (err < 0) |
206 | return err; | 206 | return err; |
207 | mixer->audigy2nx_leds[index] = value; | 207 | mixer->audigy2nx_leds[index] = value; |
@@ -299,7 +299,7 @@ static void snd_audigy2nx_proc_read(struct snd_info_entry *entry, | |||
299 | usb_rcvctrlpipe(mixer->chip->dev, 0), | 299 | usb_rcvctrlpipe(mixer->chip->dev, 0), |
300 | UAC_GET_MEM, USB_DIR_IN | USB_TYPE_CLASS | | 300 | UAC_GET_MEM, USB_DIR_IN | USB_TYPE_CLASS | |
301 | USB_RECIP_INTERFACE, 0, | 301 | USB_RECIP_INTERFACE, 0, |
302 | jacks[i].unitid << 8, buf, 3, 100); | 302 | jacks[i].unitid << 8, buf, 3); |
303 | if (err == 3 && (buf[0] == 3 || buf[0] == 6)) | 303 | if (err == 3 && (buf[0] == 3 || buf[0] == 6)) |
304 | snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]); | 304 | snd_iprintf(buffer, "%02x %02x\n", buf[1], buf[2]); |
305 | else | 305 | else |
@@ -332,7 +332,7 @@ static int snd_xonar_u1_switch_put(struct snd_kcontrol *kcontrol, | |||
332 | err = snd_usb_ctl_msg(mixer->chip->dev, | 332 | err = snd_usb_ctl_msg(mixer->chip->dev, |
333 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x08, | 333 | usb_sndctrlpipe(mixer->chip->dev, 0), 0x08, |
334 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, | 334 | USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_OTHER, |
335 | 50, 0, &new_status, 1, 100); | 335 | 50, 0, &new_status, 1); |
336 | if (err < 0) | 336 | if (err < 0) |
337 | return err; | 337 | return err; |
338 | mixer->xonar_u1_status = new_status; | 338 | mixer->xonar_u1_status = new_status; |