diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /net/decnet/dn_neigh.c | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
| download | blackbird-op-linux-b71426eb10d904d421b36f51f93c8d0ba558edac.tar.gz blackbird-op-linux-b71426eb10d904d421b36f51f93c8d0ba558edac.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'net/decnet/dn_neigh.c')
| -rw-r--r-- | net/decnet/dn_neigh.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index 5ce9c9e0565c..ff0ebe99137d 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c @@ -580,12 +580,11 @@ static int dn_neigh_seq_open(struct inode *inode, struct file *file) { struct seq_file *seq; int rc = -ENOMEM; - struct neigh_seq_state *s = kmalloc(sizeof(*s), GFP_KERNEL); + struct neigh_seq_state *s = kzalloc(sizeof(*s), GFP_KERNEL); if (!s) goto out; - memset(s, 0, sizeof(*s)); rc = seq_open(file, &dn_neigh_seq_ops); if (rc) goto out_kfree; |
