diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-23 11:27:15 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-23 11:27:15 -0700 |
commit | 831b49252207fe8c2b2d12fbfce573b3a7bf6031 (patch) | |
tree | c31675dddcc17b0bf1f2044bb0ca259b283b42c7 /driver | |
parent | 3b642cf30561220b7798fac3ea1455d505e02c39 (diff) | |
download | patches-831b49252207fe8c2b2d12fbfce573b3a7bf6031.tar.gz |
remove 2 more patches in mainline
Diffstat (limited to 'driver')
-rw-r--r-- | driver/driver-core-fix-locking-issues-with-the-devices-that-are-attached-to-classes.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/driver/driver-core-fix-locking-issues-with-the-devices-that-are-attached-to-classes.patch b/driver/driver-core-fix-locking-issues-with-the-devices-that-are-attached-to-classes.patch deleted file mode 100644 index 8cacd6931c92c..0000000000000 --- a/driver/driver-core-fix-locking-issues-with-the-devices-that-are-attached-to-classes.patch +++ /dev/null @@ -1,63 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Thu, 22 Jun 2006 17:17:32 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: Driver core: fix locking issues with the devices that are attached to classes - -Doh, that was foolish... - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/core.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - ---- gregkh-2.6.orig/drivers/base/core.c -+++ gregkh-2.6/drivers/base/core.c -@@ -356,6 +356,13 @@ int device_add(struct device *dev) - if (parent) - klist_add_tail(&dev->knode_parent, &parent->klist_children); - -+ if (dev->class) { -+ /* tie the class to the device */ -+ down(&dev->class->sem); -+ list_add_tail(&dev->node, &dev->class->devices); -+ up(&dev->class->sem); -+ } -+ - /* notify platform of device entry */ - if (platform_notify) - platform_notify(dev); -@@ -455,6 +462,9 @@ void device_del(struct device * dev) - sysfs_remove_link(&dev->kobj, "device"); - sysfs_remove_link(&dev->parent->kobj, class_name); - kfree(class_name); -+ down(&dev->class->sem); -+ list_del_init(&dev->node); -+ up(&dev->class->sem); - } - device_remove_file(dev, &dev->uevent_attr); - -@@ -601,11 +611,6 @@ struct device *device_create(struct clas - if (retval) - goto error; - -- /* tie the class to the device */ -- down(&class->sem); -- list_add_tail(&dev->node, &class->devices); -- up(&class->sem); -- - return dev; - - error: -@@ -636,9 +641,7 @@ void device_destroy(struct class *class, - } - up(&class->sem); - -- if (dev) { -- list_del_init(&dev->node); -+ if (dev) - device_unregister(dev); -- } - } - EXPORT_SYMBOL_GPL(device_destroy); |