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/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 1980f68246cb..905a53c1cde5 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -3045,7 +3045,7 @@ static void snd_pcm_oss_proc_init(struct snd_pcm *pcm)
                         continue;
                 if ((entry = snd_info_create_card_entry(pcm->card, "oss", pstr->proc_root)) != NULL) {
                         entry->content = SNDRV_INFO_CONTENT_TEXT;
-                        entry->mode = S_IFREG | S_IRUGO | S_IWUSR;
+                        entry->mode = S_IFREG | 0644;
                         entry->c.text.read = snd_pcm_oss_proc_read;
                         entry->c.text.write = snd_pcm_oss_proc_write;
                         entry->private_data = pstr;