summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2011-01-10 16:30:54 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-10 16:47:10 +0100
commit061b869eca6f725b0119f7dff833288a44bf46c0 (patch)
treec334ffddc4da0684a260813037a74fb762ecfc24
parent2a1803a7291e82823effef0b48b0039324d224c6 (diff)
downloadlinux-3.10-061b869eca6f725b0119f7dff833288a44bf46c0.tar.gz
linux-3.10-061b869eca6f725b0119f7dff833288a44bf46c0.tar.bz2
linux-3.10-061b869eca6f725b0119f7dff833288a44bf46c0.zip
ALSA: usb-audio: add Edirol SD-90 PCM support
Add support for the 24-bit audio I/Os of the Edirol SD-90 interface. Reported-any-tested-by: Jim Grusendorf <alsa-user@grusendorf.ca> Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/format.c5
-rw-r--r--sound/usb/quirks-table.h4
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/usb/format.c b/sound/usb/format.c
index 69148212aa7..5b792d2c806 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -76,7 +76,10 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip,
format = 1 << UAC_FORMAT_TYPE_I_PCM;
}
if (format & (1 << UAC_FORMAT_TYPE_I_PCM)) {
- if (sample_width > sample_bytes * 8) {
+ if (chip->usb_id == USB_ID(0x0582, 0x0016) /* Edirol SD-90 */ &&
+ sample_width == 24 && sample_bytes == 2)
+ sample_bytes = 3;
+ else if (sample_width > sample_bytes * 8) {
snd_printk(KERN_INFO "%d:%u:%d : sample bitwidth %d in over sample bytes %d\n",
chip->dev->devnum, fp->iface, fp->altsetting,
sample_width, sample_bytes);
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index ad7079d1676..35999874d30 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -705,11 +705,11 @@ YAMAHA_DEVICE(0x7010, "UB99"),
.data = (const struct snd_usb_audio_quirk[]) {
{
.ifnum = 0,
- .type = QUIRK_IGNORE_INTERFACE
+ .type = QUIRK_AUDIO_STANDARD_INTERFACE
},
{
.ifnum = 1,
- .type = QUIRK_IGNORE_INTERFACE
+ .type = QUIRK_AUDIO_STANDARD_INTERFACE
},
{
.ifnum = 2,