Merge branch 'linus' into perf/urgent, to synchronize with upstream

[linux.git] / sound / core / pcm_misc.c

diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index c4eb561d20086c9920fc2e2e63c095e896982d37..a6a5415115343e325595b9e587ae749d30377cf4 100644 (file)
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -42,7 +42,7 @@ struct pcm_format_data {
 /* we do lots of calculations on snd_pcm_format_t; shut up sparse */
 #define INT    __force int
 
-static struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = {
+static const struct pcm_format_data pcm_formats[(INT)SNDRV_PCM_FORMAT_LAST+1] = {
        [SNDRV_PCM_FORMAT_S8] = {
                .width = 8, .phys = 8, .le = -1, .signd = 1,
                .silence = {},
@@ -415,7 +415,8 @@ EXPORT_SYMBOL(snd_pcm_format_silence_64);
 int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int samples)
 {
        int width;
-       unsigned char *dst, *pat;
+       unsigned char *dst;
+       const unsigned char *pat;
 
        if ((INT)format < 0 || (INT)format > (INT)SNDRV_PCM_FORMAT_LAST)
                return -EINVAL;