Merge branch 'for-next' into topic/hda-core

1 files changed, 1 insertions, 3 deletions

diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index 5e6349f00ecd..056f8e274851 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -1212,10 +1212,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
                         /* not changed */
                         goto __unlock;
                 tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
-                if (! tbl) {
-                        pr_err("ALSA: mixer_oss: no memory\n");
+                if (!tbl)
                         goto __unlock;
-                }
                 tbl->oss_id = ch;
                 tbl->name = kstrdup(str, GFP_KERNEL);
                 if (! tbl->name) {