diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-09-04 10:10:27 +0200 |
commit | 2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91 (patch) | |
tree | 1cd995a5f989c879d3d71566a1fa2db9745c5263 /sound/firewire/motu/motu-pcm.c | |
parent | ALSA: hda: Fix regression of hdmi eld control created based on invalid pcm (diff) | |
parent | ALSA: ctxfi: Remove null check before kfree (diff) | |
download | linux-dev-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.tar.xz linux-dev-2a32a4d9c9cc4141abdf8e90f0cd167a614c9e91.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/firewire/motu/motu-pcm.c')
-rw-r--r-- | sound/firewire/motu/motu-pcm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c index a2b50df70874..4330220890e8 100644 --- a/sound/firewire/motu/motu-pcm.c +++ b/sound/firewire/motu/motu-pcm.c @@ -145,7 +145,7 @@ static int pcm_open(struct snd_pcm_substream *substream) mutex_lock(&motu->mutex); - err = protocol->cache_packet_formats(motu); + err = snd_motu_stream_cache_packet_formats(motu); if (err < 0) goto err_locked; @@ -352,7 +352,7 @@ static int playback_ack(struct snd_pcm_substream *substream) int snd_motu_create_pcm_devices(struct snd_motu *motu) { - static struct snd_pcm_ops capture_ops = { + static const struct snd_pcm_ops capture_ops = { .open = pcm_open, .close = pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -365,7 +365,7 @@ int snd_motu_create_pcm_devices(struct snd_motu *motu) .page = snd_pcm_lib_get_vmalloc_page, .mmap = snd_pcm_lib_mmap_vmalloc, }; - static struct snd_pcm_ops playback_ops = { + static const struct snd_pcm_ops playback_ops = { .open = pcm_open, .close = pcm_close, .ioctl = snd_pcm_lib_ioctl, |