From 6a609d7b9040dcbd5dcdcb034750f570ba030b11 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 12 Apr 2013 10:27:39 +0200
Subject: [PATCH] --- yaml --- r: 362471 b: refs/heads/master c:
 232a73dda2f2dba9002b727eb3ec76d82882b90c h: refs/heads/master i:   362469:
 0fcfd17e1a8028ce9af67d788e2414c03ef4d227   362467:
 d77ade4d7e5d8bb6f944114bd4251e9cf01479a0   362463:
 f8a4c0ede5cba918a06750c71c7d9c6bb1c58cc1 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/usb/mixer_quirks.c | 4 ++--
 trunk/sound/usb/quirks.c       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 217a1327a09b..654d48d6ec34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca62bed0bbf9baf88d8bb404d72dee3b44ef057e
+refs/heads/master: 232a73dda2f2dba9002b727eb3ec76d82882b90c
diff --git a/trunk/sound/usb/mixer_quirks.c b/trunk/sound/usb/mixer_quirks.c
index 497d2741d119..ebe91440a068 100644
--- a/trunk/sound/usb/mixer_quirks.c
+++ b/trunk/sound/usb/mixer_quirks.c
@@ -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);
 
@@ -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);
 
diff --git a/trunk/sound/usb/quirks.c b/trunk/sound/usb/quirks.c
index 5325a3869bb7..9c5ab22358b1 100644
--- a/trunk/sound/usb/quirks.c
+++ b/trunk/sound/usb/quirks.c
@@ -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;