diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-04-14 09:01:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-04-14 09:01:04 +0200 |
| commit | 1900d947b5ebac3c9f67d45b30f1b002131b8057 (patch) | |
| tree | 9ef776e7df9f61c8de187d86fa2717b4eb09a047 /sound/firewire/lib.h | |
| parent | 1e0f8f68f764b93e8d2d0e87e23532f2186a23a1 (diff) | |
| parent | dfb00a56935186171abb5280b3407c3f910011f1 (diff) | |
| download | op-kernel-dev-1900d947b5ebac3c9f67d45b30f1b002131b8057.zip op-kernel-dev-1900d947b5ebac3c9f67d45b30f1b002131b8057.tar.gz | |
Merge branch 'for-linus' into for-next
Back-merge to prepare for applying more FireWire updates.
Diffstat (limited to 'sound/firewire/lib.h')
| -rw-r--r-- | sound/firewire/lib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/lib.h b/sound/firewire/lib.h index f676931..c3768cd 100644 --- a/sound/firewire/lib.h +++ b/sound/firewire/lib.h @@ -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, |
