diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-12-23 00:46:45 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-12-23 00:46:45 -0600 |
| commit | 9fd28a56ce42c8707be0bb6a055cbb2c8026e9fc (patch) | |
| tree | 64db177159a15052c4e8b7fe238db742f985bf09 /include/linux | |
| parent | 6c39ac1fe9b851e3df4e7d2045dd9b515c4af9f9 (diff) | |
| parent | 14f414f1f9780778dd4323e1ec94200c6f58636e (diff) | |
Merge bk://linux.bkbits.net/linux-2.5
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/kobject.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index a2d6e8171f9b..1552ec5a4abd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -69,7 +69,6 @@ struct bus_type { struct subsystem drvsubsys; struct subsystem devsubsys; struct list_head devices; - struct list_head drivers; int (*match)(struct device * dev, struct device_driver * drv); struct device * (*add) (struct device * parent, char * bus_id); @@ -119,7 +118,6 @@ struct device_driver { struct semaphore unload_sem; struct kobject kobj; - struct list_head bus_list; struct list_head class_list; struct list_head devices; 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) |