Auto merge with /home/aegl/GIT/linus

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/char_dev.c b/fs/char_dev.c
index a69a5d8a406f..3b1b1eefdbb0 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -277,8 +277,9 @@ static struct kobject *cdev_get(struct cdev *p)
 void cdev_put(struct cdev *p)
 {
         if (p) {
+                struct module *owner = p->owner;
                 kobject_put(&p->kobj);
-                module_put(p->owner);
+                module_put(owner);
         }
 }