diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-10 17:42:14 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-10 17:42:14 +0300 |
| commit | ec0e9937aaa8b0a4b0633711c4d70d622acd9a7f (patch) | |
| tree | 7c19729d7bbd4d97784b45b2e2ec1b13dd005dd6 /sound/core/oss | |
| parent | 24db8bbaa3fcfaf0c2faccbff5864b58088ac1f6 (diff) | |
| download | linux-ec0e9937aaa8b0a4b0633711c4d70d622acd9a7f.tar.xz | |
ALSA: core: Drop superfluous error/debug messages after malloc failures
The kernel memory allocators already report the errors when the
requested allocation fails, thus we don't need to warn it again in
each caller side.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/oss')
| -rw-r--r-- | sound/core/oss/mixer_oss.c | 4 | ||||
| -rw-r--r-- | sound/core/oss/pcm_oss.c | 1 |
2 files changed, 1 insertions, 4 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) { diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 80423a4ccab6..58550cc93f28 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -854,7 +854,6 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream) params = kmalloc(sizeof(*params), GFP_KERNEL); sparams = kmalloc(sizeof(*sparams), GFP_KERNEL); if (!sw_params || !params || !sparams) { - pcm_dbg(substream->pcm, "No memory\n"); err = -ENOMEM; goto failure; } |