aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/pcm.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/usb/pcm.c')
-rw-r--r--sound/usb/pcm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index e0f3f87f99a0..630e2203b344 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -17,6 +17,7 @@
17#include <linux/init.h> 17#include <linux/init.h>
18#include <linux/usb.h> 18#include <linux/usb.h>
19#include <linux/usb/audio.h> 19#include <linux/usb/audio.h>
20#include <linux/usb/audio-v2.h>
20 21
21#include <sound/core.h> 22#include <sound/core.h>
22#include <sound/pcm.h> 23#include <sound/pcm.h>
@@ -215,7 +216,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
215 data[3] = rate >> 24; 216 data[3] = rate >> 24;
216 if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR, 217 if ((err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0), UAC2_CS_CUR,
217 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT, 218 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_OUT,
218 0x0100, chip->clock_id << 8, 219 UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
219 data, sizeof(data), 1000)) < 0) { 220 data, sizeof(data), 1000)) < 0) {
220 snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n", 221 snd_printk(KERN_ERR "%d:%d:%d: cannot set freq %d (v2)\n",
221 dev->devnum, iface, fmt->altsetting, rate); 222 dev->devnum, iface, fmt->altsetting, rate);
@@ -223,7 +224,7 @@ static int set_sample_rate_v2(struct snd_usb_audio *chip, int iface,
223 } 224 }
224 if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR, 225 if ((err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
225 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, 226 USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
226 0x0100, chip->clock_id << 8, 227 UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8,
227 data, sizeof(data), 1000)) < 0) { 228 data, sizeof(data), 1000)) < 0) {
228 snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n", 229 snd_printk(KERN_WARNING "%d:%d:%d: cannot get freq (v2)\n",
229 dev->devnum, iface, fmt->altsetting); 230 dev->devnum, iface, fmt->altsetting);