summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-20 18:57:51 +0000
committerDavid S. Miller <davem@davemloft.net>2012-09-21 12:14:20 -0700
commita9e8d1a6b87167116e5779378f1d25ffed2e833b (patch)
tree71a06afb1bfb55617f2198235b9948398550b0f1 /arch
parentdfa520af2c20aa3c75f0497d49165561212a1c6f (diff)
downloadlinux-3.10-a9e8d1a6b87167116e5779378f1d25ffed2e833b.tar.gz
linux-3.10-a9e8d1a6b87167116e5779378f1d25ffed2e833b.tar.bz2
linux-3.10-a9e8d1a6b87167116e5779378f1d25ffed2e833b.zip
sparc: fix the return value of module_alloc()
In case of error, function module_alloc() in other platform never returns ERR_PTR(), and all of the user only check for NULL, so we'd better return NULL instead of ERR_PTR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/module.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c
index bae6ab600b7..f1ddc0d2367 100644
--- a/arch/sparc/kernel/module.c
+++ b/arch/sparc/kernel/module.c
@@ -48,9 +48,7 @@ void *module_alloc(unsigned long size)
return NULL;
ret = module_map(size);
- if (!ret)
- ret = ERR_PTR(-ENOMEM);
- else
+ if (ret)
memset(ret, 0, size);
return ret;