Merge branch 'for-linus' into for-next

Back-merge to prepare for applying more FireWire updates.
This commit is contained in:
Takashi Iwai 2017-04-14 09:01:04 +02:00
commit 1900d947b5
2 changed files with 4 additions and 7 deletions

View file

@ -45,7 +45,7 @@ struct snd_fw_async_midi_port {
struct snd_rawmidi_substream *substream;
snd_fw_async_midi_port_fill fill;
unsigned int consume_bytes;
int consume_bytes;
};
int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port,