Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 362471
b: refs/heads/master
c: 232a73d
h: refs/heads/master
i:
  362469: 0fcfd17
  362467: d77ade4
  362463: f8a4c0e
v: v3
  • Loading branch information
Takashi Iwai committed Apr 12, 2013
1 parent f3a848a commit 6a609d7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ca62bed0bbf9baf88d8bb404d72dee3b44ef057e
refs/heads/master: 232a73dda2f2dba9002b727eb3ec76d82882b90c
4 changes: 2 additions & 2 deletions trunk/sound/usb/mixer_quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,
else
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), bRequest,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
0, cpu_to_le16(wIndex),
0, wIndex,
&tmp, sizeof(tmp), 1000);
up_read(&mixer->chip->shutdown_rwsem);

Expand Down Expand Up @@ -540,7 +540,7 @@ static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,
else
ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), bRequest,
USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
cpu_to_le16(wValue), cpu_to_le16(wIndex),
wValue, wIndex,
NULL, 0, 1000);
up_read(&mixer->chip->shutdown_rwsem);

Expand Down
2 changes: 1 addition & 1 deletion trunk/sound/usb/quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
{
int ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
0xaf, USB_TYPE_VENDOR | USB_RECIP_DEVICE,
cpu_to_le16(1), 0, NULL, 0, 1000);
1, 0, NULL, 0, 1000);

if (ret < 0)
return ret;
Expand Down

0 comments on commit 6a609d7

Please sign in to comment.