driver core patches for 2.6.30-rc7
PATCH 1/1 driver core patches for 2.6.30-rc7
Here are two driver-core patches for your 2.6.30-rc7 tree.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/
All of these patches have been in the linux-next and mm trees for a while.
The patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
------------
drivers/base/bus.c | 4 +++- drivers/base/core.c | 5 ++++- drivers/base/driver.c | 4 ++++ fs/sysfs/file.c | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-)
---------------
Andrew Morton (1):
sysfs: file.c: use create_singlethread_workqueue()
Kay Sievers (1):
Driver Core: do not oops when driver_unregister() is called for unregistered drivers
PATCH 1/2 sysfs: file.c: use create_singlethread_workqueue()
From: Andrew Morton <[email protected]>
We don't need a kernel thread per CPU for this application.
--- fs/sysfs/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/sysfs/file.c +1 -1
@@ -723,7 +723,7 @@ int sysfs_schedule_callback(struct kobject *kobj, void (*func)(void *),mutex_unlock (&sysfs_workq_mutex);if (sysfs_workqueue ==NULL ) { - sysfs_workqueue =create_workqueue ("sysfsd" ); + sysfs_workqueue =create_singlethread_workqueue ("sysfsd" );if (sysfs_workqueue ==NULL ) {module_put (owner);return -ENOMEM ;
Signature · 1 line
1.6.3
PATCH 2/2 Driver Core: do not oops when driver_unregister() is called for unregistered drivers
In reply to Greg KHFrom: Kay Sievers <[email protected]>
We also fix a problem with cleaning up properly when initializing drivers and devices, so checks like this will work successfully.
Portions of the patch by Linus and Greg and Ingo.
--- drivers/base/bus.c | 4 +++- drivers/base/core.c | 5 ++++- drivers/base/driver.c | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/base/bus.c +3 -1
@@ -700,8 +700,10 @@ int bus_add_driver(struct device_driver *drv) }kobject_uevent (&priv->kobj,KOBJ_ADD ); -return error; +return 0 ; out_unregister: +kfree (drv->p); + drv->p =NULL ;kobject_put (&priv->kobj); out_put_bus:bus_put (bus);
drivers/base/core.c +4 -1
@@ -879,7 +879,7 @@ int device_add(struct device *dev) }if (!dev_name (dev)) - goto done; + goto name_error;pr_debug ("device: '%s': %s\n" ,dev_name (dev), __func__);
@@ -978,6 +978,9 @@ done:cleanup_device_parent (dev);if (parent)put_device (parent); +name_error: +kfree (dev->p); + dev->p =NULL ; goto done; }
drivers/base/driver.c +4 -0
@@ -257,6 +257,10 @@ EXPORT_SYMBOL_GPL(driver_register);*/ void driver_unregister (struct device_driver *drv) { +if (!drv || !drv->p) { +WARN (1 ,"Unexpected driver unregister!\n" ); +return ; + }driver_remove_groups (drv, drv->groups);bus_remove_driver (drv); }
Signature · 1 line
1.6.3