git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pandora-27-omap1' into rev2
[pandora-kernel.git]
/
net
/
atm
/
proc.c
diff --git
a/net/atm/proc.c
b/net/atm/proc.c
index
5c9f3d1
..
49487b3
100644
(file)
--- a/
net/atm/proc.c
+++ b/
net/atm/proc.c
@@
-417,12
+417,10
@@
int atm_proc_dev_register(struct atm_dev *dev)
goto err_out;
sprintf(dev->proc_name,"%s:%d",dev->type, dev->number);
goto err_out;
sprintf(dev->proc_name,"%s:%d",dev->type, dev->number);
- dev->proc_entry = proc_create(dev->proc_name, 0, atm_proc_root,
-
&proc_atm_dev_ops
);
+ dev->proc_entry = proc_create
_data
(dev->proc_name, 0, atm_proc_root,
+
&proc_atm_dev_ops, dev
);
if (!dev->proc_entry)
goto err_free_name;
if (!dev->proc_entry)
goto err_free_name;
- dev->proc_entry->data = dev;
- dev->proc_entry->owner = THIS_MODULE;
return 0;
err_free_name:
kfree(dev->proc_name);
return 0;
err_free_name:
kfree(dev->proc_name);