[PATCH 21/24] wanrouter: Remove unnecessary OOM logging messages

Joe Perches
2011-08-29T21:22:06Z

net/wanrouter/wanmain.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 788a12c..01d0be4 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -437,11 +437,8 @@ static int wanrouter_device_setup(struct wan_device *wandev,
}

conf = kmalloc(sizeof(wandev_conf_t), GFP_KERNEL);
- if (conf == NULL){
- printk(KERN_INFO "%s: ERROR, Failed to allocate kernel memory !\n",
- wandev->name);
+ if (conf == NULL)
return -ENOBUFS;
- }

if (copy_from_user(conf, u_conf, sizeof(wandev_conf_t))) {
printk(KERN_INFO "%s: Failed to copy user config data to kernel space!\n",
@@ -468,9 +465,6 @@ static int wanrouter_device_setup(struct wan_device *wandev,

data = vmalloc(conf->data_size);
if (!data) {
- printk(KERN_INFO
- "%s: ERROR, Failed allocate kernel memory !\n",
- wandev->name);
kfree(conf);
return -ENOBUFS;
}
--
1.7.6.405.gc1be0