xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/firewire-update' into for-next

Browse Source
This commit is contained in:
Takashi Iwai
2015-09-29 12:52:07 +02:00
parent e87359efca df075feefb
commit d8dfacf8b5
440 changed files with 5565 additions and 2983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/firewire/oxfw/oxfw-stream.c
View File

@@ -155,7 +155,10 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream,
err = -EINVAL;
goto end;
}
amdtp_stream_set_parameters(stream, rate, pcm_channels, midi_ports);
err = amdtp_am824_set_parameters(stream, rate, pcm_channels, midi_ports,
false);
if (err < 0)
goto end;
err = cmp_connection_establish(conn,
amdtp_stream_get_max_payload(stream));
@@ -225,7 +228,7 @@ int snd_oxfw_stream_init_simplex(struct snd_oxfw *oxfw,
if (err < 0)
goto end;
err = amdtp_stream_init(stream, oxfw->unit, s_dir, CIP_NONBLOCKING);
err = amdtp_am824_init(stream, oxfw->unit, s_dir, CIP_NONBLOCKING);
if (err < 0) {
amdtp_stream_destroy(stream);
cmp_connection_destroy(conn);
@@ -483,8 +486,8 @@ int snd_oxfw_stream_parse_format(u8 *format,
}
}
if (formation->pcm > AMDTP_MAX_CHANNELS_FOR_PCM ||
formation->midi > AMDTP_MAX_CHANNELS_FOR_MIDI)
if (formation->pcm > AM824_MAX_CHANNELS_FOR_PCM ||
formation->midi > AM824_MAX_CHANNELS_FOR_MIDI)
return -ENOSYS;
return 0;