Merge branch 'linux-2.6' into merge

1 files changed, 4 insertions, 0 deletions

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 0e450d12f035..a2efa7ff41f1 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -1250,6 +1250,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);