diff --git a/fs/char_dev.c b/fs/char_dev.c
index 8a63cfa2900533c882a800d34f568b4cc760b83a..5fffd5050fb7a3538e43c503daa1804c6c95eb84 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -361,7 +361,7 @@ static struct kobject *cdev_get(struct cdev *p)
 
 	if (owner && !try_module_get(owner))
 		return NULL;
-	kobj = kobject_get(&p->kobj);
+	kobj = kobject_get_unless_zero(&p->kobj);
 	if (!kobj)
 		module_put(owner);
 	return kobj;