aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-01-16 12:05:34 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-16 12:05:34 -0800
commit7895f2d08e6c466fe4234aed325ca821c4210fbc (patch)
tree20d22361777c0766e91042b199e102051e1604ce /driver
parentdd9de0f69397dc638de28b8a92b13b9a3a290e3b (diff)
downloadpatches-7895f2d08e6c466fe4234aed325ca821c4210fbc.tar.gz
move driver patches into driver directory
Diffstat (limited to 'driver')
-rw-r--r--driver/kobject_add-must-have-valid-name.patch28
-rw-r--r--driver/put_device-might_sleep.patch22
2 files changed, 50 insertions, 0 deletions
diff --git a/driver/kobject_add-must-have-valid-name.patch b/driver/kobject_add-must-have-valid-name.patch
new file mode 100644
index 0000000000000..5cec283669eef
--- /dev/null
+++ b/driver/kobject_add-must-have-valid-name.patch
@@ -0,0 +1,28 @@
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: kobject_add() must have a valid name in order to succeed.
+
+So we might as well check to verify this, and let the user know that
+something is wrong if they didn't do it correctly, instead of oopsing
+later on in kobject_get_name() or somewhere else.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ lib/kobject.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- gregkh-2.6.orig/lib/kobject.c
++++ gregkh-2.6/lib/kobject.c
+@@ -164,6 +164,11 @@ int kobject_add(struct kobject * kobj)
+ return -ENOENT;
+ if (!kobj->k_name)
+ kobj->k_name = kobj->name;
++ if (!kobj->k_name) {
++ pr_debug("kobject attempted to be registered with no name!\n");
++ WARN_ON(1);
++ return -EINVAL;
++ }
+ parent = kobject_get(kobj->parent);
+
+ pr_debug("kobject %s: registering. parent: %s, set: %s\n",
diff --git a/driver/put_device-might_sleep.patch b/driver/put_device-might_sleep.patch
new file mode 100644
index 0000000000000..2c79699561ffb
--- /dev/null
+++ b/driver/put_device-might_sleep.patch
@@ -0,0 +1,22 @@
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: Make put_device() warn that it will sleep
+
+This makes scsi emit messages all over the place...
+But it's something that we need to fix up.
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/base/core.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- gregkh-2.6.orig/drivers/base/core.c
++++ gregkh-2.6/drivers/base/core.c
+@@ -340,6 +340,7 @@ struct device * get_device(struct device
+ */
+ void put_device(struct device * dev)
+ {
++ might_sleep();
+ if (dev)
+ kobject_put(&dev->kobj);
+ }