diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 09:14:55 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 09:14:55 +0100 |
commit | db8c076b9206ea35b1f7299708d5510b17674db2 (patch) | |
tree | 7a5ee32db0c25bb29598c7c300ce7f2680f533a9 /drivers/net/eql.c | |
parent | af6261031317f646d22f994c0b467521e47aa49f (diff) | |
parent | b30a3f6257ed2105259b404d419b4964e363928c (diff) | |
download | talos-op-linux-db8c076b9206ea35b1f7299708d5510b17674db2.tar.gz talos-op-linux-db8c076b9206ea35b1f7299708d5510b17674db2.zip |
Merge remote branch 'linus' into drm-intel-fixes
Diffstat (limited to 'drivers/net/eql.c')
-rw-r--r-- | drivers/net/eql.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index dda2c7944da9..0cb1cf9cf4b0 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c @@ -555,6 +555,8 @@ static int eql_g_master_cfg(struct net_device *dev, master_config_t __user *mcp) equalizer_t *eql; master_config_t mc; + memset(&mc, 0, sizeof(master_config_t)); + if (eql_is_master(dev)) { eql = netdev_priv(dev); mc.max_slaves = eql->max_slaves; |