diff options
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 2 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks.h | 1 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks_stream.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index c670db4eee70..2682e7e3e5c9 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c | |||
| @@ -248,8 +248,6 @@ efw_probe(struct fw_unit *unit, | |||
| 248 | err = get_hardware_info(efw); | 248 | err = get_hardware_info(efw); |
| 249 | if (err < 0) | 249 | if (err < 0) |
| 250 | goto error; | 250 | goto error; |
| 251 | if (entry->model_id == MODEL_ECHO_AUDIOFIRE_2) | ||
| 252 | efw->is_af2 = true; | ||
| 253 | if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) | 251 | if (entry->model_id == MODEL_ECHO_AUDIOFIRE_9) |
| 254 | efw->is_af9 = true; | 252 | efw->is_af9 = true; |
| 255 | 253 | ||
diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h index c33252b7bc84..4f0201a95222 100644 --- a/sound/firewire/fireworks/fireworks.h +++ b/sound/firewire/fireworks/fireworks.h | |||
| @@ -70,7 +70,6 @@ struct snd_efw { | |||
| 70 | bool resp_addr_changable; | 70 | bool resp_addr_changable; |
| 71 | 71 | ||
| 72 | /* for quirks */ | 72 | /* for quirks */ |
| 73 | bool is_af2; | ||
| 74 | bool is_af9; | 73 | bool is_af9; |
| 75 | u32 firmware_version; | 74 | u32 firmware_version; |
| 76 | 75 | ||
diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c index a0762dd6231e..c55db1bddc80 100644 --- a/sound/firewire/fireworks/fireworks_stream.c +++ b/sound/firewire/fireworks/fireworks_stream.c | |||
| @@ -172,9 +172,6 @@ int snd_efw_stream_init_duplex(struct snd_efw *efw) | |||
| 172 | efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT; | 172 | efw->tx_stream.flags |= CIP_DBC_IS_END_EVENT; |
| 173 | /* Fireworks reset dbc at bus reset. */ | 173 | /* Fireworks reset dbc at bus reset. */ |
| 174 | efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK; | 174 | efw->tx_stream.flags |= CIP_SKIP_DBC_ZERO_CHECK; |
| 175 | /* AudioFire2 starts packets with non-zero dbc. */ | ||
| 176 | if (efw->is_af2) | ||
| 177 | efw->tx_stream.flags |= CIP_SKIP_INIT_DBC_CHECK; | ||
| 178 | /* AudioFire9 always reports wrong dbs. */ | 175 | /* AudioFire9 always reports wrong dbs. */ |
| 179 | if (efw->is_af9) | 176 | if (efw->is_af9) |
| 180 | efw->tx_stream.flags |= CIP_WRONG_DBS; | 177 | efw->tx_stream.flags |= CIP_WRONG_DBS; |
