diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-20 08:52:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-20 08:52:50 +0100 |
| commit | fc0e23fad33198fc7d74227dba7bbc3a5d7755aa (patch) | |
| tree | 669319e33fb63a456986b6ac41cf3b584f583caf /sound/core | |
| parent | af677166cf63c179dc2485053166e02c4aea01eb (diff) | |
| parent | 3bb9eca913025ed05c0510de831c67b7bef652c5 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/rawmidi.c | 2 | ||||
| -rw-r--r-- | sound/core/seq/seq_virmidi.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 2096bb0835c8..8da9cb245d01 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -1749,7 +1749,7 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device) * Sets the rawmidi operators for the given stream direction. */ void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream, - struct snd_rawmidi_ops *ops) + const struct snd_rawmidi_ops *ops) { struct snd_rawmidi_substream *substream; diff --git a/sound/core/seq/seq_virmidi.c b/sound/core/seq/seq_virmidi.c index c82ed3e70506..52f31f1498f9 100644 --- a/sound/core/seq/seq_virmidi.c +++ b/sound/core/seq/seq_virmidi.c @@ -349,13 +349,13 @@ static int snd_virmidi_unuse(void *private_data, * Register functions */ -static struct snd_rawmidi_ops snd_virmidi_input_ops = { +static const struct snd_rawmidi_ops snd_virmidi_input_ops = { .open = snd_virmidi_input_open, .close = snd_virmidi_input_close, .trigger = snd_virmidi_input_trigger, }; -static struct snd_rawmidi_ops snd_virmidi_output_ops = { +static const struct snd_rawmidi_ops snd_virmidi_output_ops = { .open = snd_virmidi_output_open, .close = snd_virmidi_output_close, .trigger = snd_virmidi_output_trigger, |