summaryrefslogtreecommitdiffstats
path: root/net/core/ethtool.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-01-26 13:49:30 -0800
committerDavid S. Miller <davem@davemloft.net>2011-01-26 13:49:30 -0800
commitb4e69ac670d71b5748dc81e536b2cb103489badd (patch)
tree26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /net/core/ethtool.c
parent144ce879b057c760194d808c90826cd96308f423 (diff)
parent7cc2edb83447775a34ed3bf9d29d8295a434b523 (diff)
downloadop-kernel-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.zip
op-kernel-dev-b4e69ac670d71b5748dc81e536b2cb103489badd.tar.gz
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core/ethtool.c')
-rw-r--r--net/core/ethtool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index bd1af99..5984ee0 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -817,7 +817,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr)
if (regs.len > reglen)
regs.len = reglen;
- regbuf = vmalloc(reglen);
+ regbuf = vzalloc(reglen);
if (!regbuf)
return -ENOMEM;
OpenPOWER on IntegriCloud