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/isa/sb/sb16_main.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/isa/sb/sb16_main.c')
| -rw-r--r-- | sound/isa/sb/sb16_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/sb/sb16_main.c b/sound/isa/sb/sb16_main.c index 4be1350f6649..3e39ba220c39 100644 --- a/sound/isa/sb/sb16_main.c +++ b/sound/isa/sb/sb16_main.c @@ -473,7 +473,7 @@ static snd_pcm_uframes_t snd_sb16_capture_pointer(struct snd_pcm_substream *subs */ -static struct snd_pcm_hardware snd_sb16_playback = +static const struct snd_pcm_hardware snd_sb16_playback = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), @@ -491,7 +491,7 @@ static struct snd_pcm_hardware snd_sb16_playback = .fifo_size = 0, }; -static struct snd_pcm_hardware snd_sb16_capture = +static const struct snd_pcm_hardware snd_sb16_capture = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP_VALID), @@ -838,7 +838,7 @@ int snd_sb16dsp_configure(struct snd_sb * chip) return 0; } -static struct snd_pcm_ops snd_sb16_playback_ops = { +static const struct snd_pcm_ops snd_sb16_playback_ops = { .open = snd_sb16_playback_open, .close = snd_sb16_playback_close, .ioctl = snd_pcm_lib_ioctl, @@ -849,7 +849,7 @@ static struct snd_pcm_ops snd_sb16_playback_ops = { .pointer = snd_sb16_playback_pointer, }; -static struct snd_pcm_ops snd_sb16_capture_ops = { +static const struct snd_pcm_ops snd_sb16_capture_ops = { .open = snd_sb16_capture_open, .close = snd_sb16_capture_close, .ioctl = snd_pcm_lib_ioctl, |