Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp

[linux-2.6-omap-h63xx.git] / fs / char_dev.c

diff --git a/fs/char_dev.c b/fs/char_dev.c
index a69a5d8a406f982be7eb6cb1fc9c4ff59a858ffa..3b1b1eefdbb01686f127df582143f922bf87c193 100644 (file)
--- 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);
        }
 }