From 039294682d6a32455623da81076597a6f8da39b3 Mon Sep 17 00:00:00 2001 From: Patrick Mochel Date: Thu, 19 Dec 2002 03:46:29 -0600 Subject: kobjects: minor updates - check if subsystem is NULL during subsys_get(). - Don't increment parent's reference count before we check if we have a valid kobject during kobject_add() - Do kobject_add() in subsys_register(), instead of kobject_register(), since we've already done kobject_init(). --- include/linux/kobject.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/linux/kobject.h') diff --git a/include/linux/kobject.h b/include/linux/kobject.h index 6b528c5a61cb..821d17e15a01 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h @@ -52,7 +52,7 @@ extern void subsystem_unregister(struct subsystem *); static inline struct subsystem * subsys_get(struct subsystem * s) { - return container_of(kobject_get(&s->kobj),struct subsystem,kobj); + return s ? container_of(kobject_get(&s->kobj),struct subsystem,kobj) : NULL; } static inline void subsys_put(struct subsystem * s) -- cgit v1.2.3