diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-09-14 14:22:30 -0700 |
| commit | a143f427f3e7c6d80bc1d288334706a1f8237f5f (patch) | |
| tree | 59e96413cf2013afb70bfaaca5f89937d9d7ac20 /sound/firewire/fireworks/fireworks.c | |
| parent | d9e292d3ea94ab21f028108527a908e415e856ef (diff) | |
| parent | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-15.11-rtlsk-v4.1-15.10-rtlsk-v4.1-15.09-rt
Diffstat (limited to 'sound/firewire/fireworks/fireworks.c')
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 2682e7e3e5c9..c94a432f7cc6 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -248,8 +248,16 @@ efw_probe(struct fw_unit *unit, err = get_hardware_info(efw); if (err < 0) goto error; + /* AudioFire8 (since 2009) and AudioFirePre8 */ if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) efw->is_af9 = true; + /* These models uses the same firmware. */ + if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2 || + entry->model_id == MODEL_ECHO_AUDIOFIRE_4 || + entry->model_id == MODEL_ECHO_AUDIOFIRE_9 || + entry->model_id == MODEL_GIBSON_RIP || + entry->model_id == MODEL_GIBSON_GOLDTOP) + efw->is_fireworks3 = true; snd_efw_proc_init(efw); |