Merge branch 'for-next' into for-linus

4.18-rc1 merge material.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/core/info.c b/sound/core/info.c
index 4b36767af9e1..fe502bc5e6d2 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -454,7 +454,7 @@ static struct snd_info_entry *create_subdir(struct module *mod,
         entry = snd_info_create_module_entry(mod, name, NULL);
         if (!entry)
                 return NULL;
-        entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+        entry->mode = S_IFDIR | 0555;
         if (snd_info_register(entry) < 0) {
                 snd_info_free_entry(entry);
                 return NULL;
@@ -470,7 +470,7 @@ int __init snd_info_init(void)
         snd_proc_root = snd_info_create_entry("asound", NULL);
         if (!snd_proc_root)
                 return -ENOMEM;
-        snd_proc_root->mode = S_IFDIR | S_IRUGO | S_IXUGO;
+        snd_proc_root->mode = S_IFDIR | 0555;
         snd_proc_root->p = proc_mkdir("asound", NULL);
         if (!snd_proc_root->p)
                 goto error;
@@ -716,7 +716,7 @@ snd_info_create_entry(const char *name, struct snd_info_entry *parent)
                 kfree(entry);
                 return NULL;
         }
-        entry->mode = S_IFREG | S_IRUGO;
+        entry->mode = S_IFREG | 0444;
         entry->content = SNDRV_INFO_CONTENT_TEXT;
         mutex_init(&entry->access);
         INIT_LIST_HEAD(&entry->children);