diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2017-04-14 09:46:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-04-14 14:50:36 +0200 |
| commit | 98a00d3602a1c50a397893c5de26dbbe7d77804a (patch) | |
| tree | ab8d0c8563e9894b7948f9bf7db5b02f74f2da55 /sound/firewire/tascam/tascam.h | |
| parent | ALSA: firewire-tascam: use the same address for asynchronous transaction for ... (diff) | |
| download | linux-98a00d3602a1c50a397893c5de26dbbe7d77804a.tar.xz linux-98a00d3602a1c50a397893c5de26dbbe7d77804a.zip | |
ALSA: firewire-tascam: use fixed-length array for message cache to async midi port
ALSA driver for TASCAM FireWire series internally allocates 4 byte buffer
for asynchronous transaction to transfer MIDI messages. However, the buffer
can be allocated with memory object of parent structure.
This commit adds 4 byte array as a member of the structure and obsoletes
the redundant allocation. This is deallocated with memory object of parent
structure.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/tascam/tascam.h')
| -rw-r--r-- | sound/firewire/tascam/tascam.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/tascam/tascam.h b/sound/firewire/tascam/tascam.h index de0aefe2d690..fdf352bc303f 100644 --- a/sound/firewire/tascam/tascam.h +++ b/sound/firewire/tascam/tascam.h @@ -54,7 +54,7 @@ struct snd_fw_async_midi_port { struct fw_transaction transaction; - u8 *buf; + u8 buf[4]; struct snd_rawmidi_substream *substream; int consume_bytes; @@ -148,7 +148,6 @@ void snd_tscm_stream_lock_release(struct snd_tscm *tscm); int snd_fw_async_midi_port_init(struct snd_fw_async_midi_port *port, struct fw_unit *unit); -void snd_fw_async_midi_port_destroy(struct snd_fw_async_midi_port *port); static inline void snd_fw_async_midi_port_run(struct snd_fw_async_midi_port *port, @@ -164,6 +163,7 @@ static inline void snd_fw_async_midi_port_finish(struct snd_fw_async_midi_port *port) { port->substream = NULL; + cancel_work_sync(&port->work); port->error = false; } |