diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-02 11:00:37 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-02 11:00:37 +0300 |
| commit | bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch) | |
| tree | 1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/firewire/fireworks/fireworks.c | |
| parent | cadd16ea33a938d49aee99edd4758cc76048b399 (diff) | |
| parent | 2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff) | |
| download | linux-bc88c9e923819b02f8cfaec1bb80d7e5530c0ac5.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/firewire/fireworks/fireworks.c')
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index c94a432f7cc6..d5b19bc11e59 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -138,12 +138,12 @@ get_hardware_info(struct snd_efw *efw) efw->midi_out_ports = hwinfo->midi_out_ports; efw->midi_in_ports = hwinfo->midi_in_ports; - if (hwinfo->amdtp_tx_pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM || - hwinfo->amdtp_tx_pcm_channels_2x > AMDTP_MAX_CHANNELS_FOR_PCM || - hwinfo->amdtp_tx_pcm_channels_4x > AMDTP_MAX_CHANNELS_FOR_PCM || - hwinfo->amdtp_rx_pcm_channels > AMDTP_MAX_CHANNELS_FOR_PCM || - hwinfo->amdtp_rx_pcm_channels_2x > AMDTP_MAX_CHANNELS_FOR_PCM || - hwinfo->amdtp_rx_pcm_channels_4x > AMDTP_MAX_CHANNELS_FOR_PCM) { + if (hwinfo->amdtp_tx_pcm_channels > AM824_MAX_CHANNELS_FOR_PCM || + hwinfo->amdtp_tx_pcm_channels_2x > AM824_MAX_CHANNELS_FOR_PCM || + hwinfo->amdtp_tx_pcm_channels_4x > AM824_MAX_CHANNELS_FOR_PCM || + hwinfo->amdtp_rx_pcm_channels > AM824_MAX_CHANNELS_FOR_PCM || + hwinfo->amdtp_rx_pcm_channels_2x > AM824_MAX_CHANNELS_FOR_PCM || + hwinfo->amdtp_rx_pcm_channels_4x > AM824_MAX_CHANNELS_FOR_PCM) { err = -ENOSYS; goto end; } |