diff options
author | David S. Miller <davem@davemloft.net> | 2008-03-23 22:54:03 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-03-23 22:54:03 -0700 |
commit | 06802a819a0a2d31c952c0624cea6cd00e4e50da (patch) | |
tree | 8ccd7c668c7fbd8f08cb89426006040217caf3f1 /net/atm/lec.c | |
parent | 9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff) | |
parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) | |
download | op-kernel-dev-06802a819a0a2d31c952c0624cea6cd00e4e50da.zip op-kernel-dev-06802a819a0a2d31c952c0624cea6cd00e4e50da.tar.gz |
Merge branch 'master' of ../net-2.6/
Conflicts:
net/ipv6/ndisc.c
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r-- | net/atm/lec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index e2d800d..aa3785e 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -1225,6 +1225,10 @@ static int __init lane_module_init(void) struct proc_dir_entry *p; p = proc_create("lec", S_IRUGO, atm_proc_root, &lec_seq_fops); + if (!p) { + printk(KERN_ERR "Unable to initialize /proc/net/atm/lec\n"); + return -ENOMEM; + } #endif register_atm_ioctl(&lane_ioctl_ops); |