diff --git a/[refs] b/[refs] index 42f8157e2c9d..3cd92172486b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4 +refs/heads/master: b7c7d01aaed1f71d9afe815a569f0a81465a1744 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 17741782a345..ff2302910b5e 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/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;