projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
net
/
atm
/
clip.c
diff --git
a/net/atm/clip.c
b/net/atm/clip.c
index
2e62105
..
7ce7bfe
100644
(file)
--- a/
net/atm/clip.c
+++ b/
net/atm/clip.c
@@
-929,12
+929,11
@@
static int arp_seq_open(struct inode *inode, struct file *file)
struct seq_file *seq;
int rc = -EAGAIN;
struct seq_file *seq;
int rc = -EAGAIN;
- state = k
m
alloc(sizeof(*state), GFP_KERNEL);
+ state = k
z
alloc(sizeof(*state), GFP_KERNEL);
if (!state) {
rc = -ENOMEM;
goto out_kfree;
}
if (!state) {
rc = -ENOMEM;
goto out_kfree;
}
- memset(state, 0, sizeof(*state));
state->ns.neigh_sub_iter = clip_seq_sub_iter;
rc = seq_open(file, &arp_seq_ops);
state->ns.neigh_sub_iter = clip_seq_sub_iter;
rc = seq_open(file, &arp_seq_ops);