diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-02-09 23:08:48 +0100 |
commit | 9b88daa5137f15c051e5673dd2ce9acf678f84dc (patch) | |
tree | 5f9bdcaa275b0757a12e9dd2327a86249eeb4302 /sound/firewire/tascam/tascam.c | |
parent | dfabc0eee1400b910d9e0f4bc55af8d2797927d2 (diff) | |
parent | 397da2d0ab0d1398242622d80a74df7245395c63 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire/tascam/tascam.c')
-rw-r--r-- | sound/firewire/tascam/tascam.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c index ee0bc1839508..e281c338e562 100644 --- a/sound/firewire/tascam/tascam.c +++ b/sound/firewire/tascam/tascam.c @@ -21,7 +21,6 @@ static struct snd_tscm_spec model_specs[] = { .pcm_playback_analog_channels = 8, .midi_capture_ports = 4, .midi_playback_ports = 4, - .is_controller = true, }, { .name = "FW-1082", @@ -31,9 +30,16 @@ static struct snd_tscm_spec model_specs[] = { .pcm_playback_analog_channels = 2, .midi_capture_ports = 2, .midi_playback_ports = 2, - .is_controller = true, }, - /* FW-1804 may be supported. */ + { + .name = "FW-1804", + .has_adat = true, + .has_spdif = true, + .pcm_capture_analog_channels = 8, + .pcm_playback_analog_channels = 2, + .midi_capture_ports = 2, + .midi_playback_ports = 4, + }, }; static int identify_model(struct snd_tscm *tscm) |