Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 1 insertions, 1 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 379bf486ccc7..64d904bee8bb 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1247,7 +1247,7 @@ static void snd_mixer_oss_proc_init(struct snd_mixer_oss *mixer)
         if (! entry)
                 return;
         entry->content = SNDRV_INFO_CONTENT_TEXT;
-        entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+        entry->mode = S_IFREG | 0644;
         entry->c.text.read = snd_mixer_oss_proc_read;
         entry->c.text.write = snd_mixer_oss_proc_write;
         entry->private_data = mixer;