diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-03-11 15:13:21 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-12 06:20:07 -0500 |
commit | 45d760567a7d773237b8996584a4ae0440d5e369 (patch) | |
tree | 01a57c042733dde1b9488b8739c37b1a54a65a72 /sound/usb/format.c | |
parent | 7e847894039d7590321de306fca2b1ae58662f29 (diff) |
ALSA: usb-mixer: use defines from audio.h
No need for the private enum.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/format.c')
-rw-r--r-- | sound/usb/format.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c index 0e04efe9551e..fcadedd94543 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c | |||
@@ -218,7 +218,8 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, | |||
218 | /* get the number of sample rates first by only fetching 2 bytes */ | 218 | /* get the number of sample rates first by only fetching 2 bytes */ |
219 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, | 219 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, |
220 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | 220 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, |
221 | 0x0100, chip->clock_id << 8, tmp, sizeof(tmp), 1000); | 221 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, |
222 | tmp, sizeof(tmp), 1000); | ||
222 | 223 | ||
223 | if (ret < 0) { | 224 | if (ret < 0) { |
224 | snd_printk(KERN_ERR "unable to retrieve number of sample rates\n"); | 225 | snd_printk(KERN_ERR "unable to retrieve number of sample rates\n"); |
@@ -236,7 +237,8 @@ static int parse_audio_format_rates_v2(struct snd_usb_audio *chip, | |||
236 | /* now get the full information */ | 237 | /* now get the full information */ |
237 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, | 238 | ret = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_RANGE, |
238 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, | 239 | USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN, |
239 | 0x0100, chip->clock_id << 8, data, data_size, 1000); | 240 | UAC2_CS_CONTROL_SAM_FREQ << 8, chip->clock_id << 8, |
241 | data, data_size, 1000); | ||
240 | 242 | ||
241 | if (ret < 0) { | 243 | if (ret < 0) { |
242 | snd_printk(KERN_ERR "unable to retrieve sample rate range\n"); | 244 | snd_printk(KERN_ERR "unable to retrieve sample rate range\n"); |