2 files changed, 3 insertions, 17 deletions

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index e11dc22c6511..d78ade305541 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -58,11 +58,8 @@ static void proc_delete_inode(struct inode *inode)
 
         /* Let go of any associated proc directory entry */
         de = PROC_I(inode)->pde;
-        if (de) {
-                if (de->owner)
-                        module_put(de->owner);
+        if (de)
                 de_put(de);
-        }
         if (PROC_I(inode)->sysctl)
                 sysctl_head_put(PROC_I(inode)->sysctl);
         clear_inode(inode);
@@ -449,12 +446,9 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
 {
         struct inode * inode;
 
-        if (!try_module_get(de->owner))
-                goto out_mod;
-
         inode = iget_locked(sb, ino);
         if (!inode)
-                goto out_ino;
+                return NULL;
         if (inode->i_state & I_NEW) {
                 inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
                 PROC_I(inode)->fd = 0;
@@ -485,16 +479,9 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
                         }
                 }
                 unlock_new_inode(inode);
-        } else {
-               module_put(de->owner);
+        } else
                de_put(de);
-        }
         return inode;
-
-out_ino:
-        module_put(de->owner);
-out_mod:
-        return NULL;
 }                       
 
 int proc_fill_super(struct super_block *s)
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index d153946d6d15..4a9e0f65ae60 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -152,7 +152,6 @@ void proc_tty_register_driver(struct tty_driver *driver)
         if (!ent)
                 return;
         ent->read_proc = driver->ops->read_proc;
-        ent->owner = driver->owner;
         ent->data = driver;
 
         driver->proc_entry = ent;