diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-18 16:24:31 +0200 |
| commit | 8dd2b66d1a961231685a3bfe5937c85d846fbf5d (patch) | |
| tree | 8117553488bf4ef09b048a4b343cf37cc16bf46d /sound/usb/quirks.c | |
| parent | 126825e7ea271ae8e3172e10ca1fc22c908b5385 (diff) | |
| parent | 24568ea4bef5ab8106206eddf5512434421c00ed (diff) | |
| download | linux-8dd2b66d1a961231685a3bfe5937c85d846fbf5d.tar.bz2 | |
Merge tag 'asoc-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.10
The main additional change here is Lars-Peter's DMA work plus the
platform conversions which have been tested - getting this in mainline
will make life easier for development after the merge window. These
factor a large chunk of code out of the drivers for the platforms using
dmaengine, greatly simplifying development.
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index e564adb74852..3879eae7e874 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -499,7 +499,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; |