mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 20:40:52 +07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: Driver Core: do not oops when driver_unregister() is called for unregistered drivers sysfs: file.c: use create_singlethread_workqueue()
This commit is contained in:
commit
deeb103412
@ -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);
|
||||
|
@ -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 @@ int device_add(struct device *dev)
|
||||
cleanup_device_parent(dev);
|
||||
if (parent)
|
||||
put_device(parent);
|
||||
name_error:
|
||||
kfree(dev->p);
|
||||
dev->p = NULL;
|
||||
goto done;
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user