diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-29 17:12:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-29 17:12:38 -0800 |
| commit | 68c35946496d39baa69fb065b9dc0acf4b9bcbfa (patch) | |
| tree | e0f406633f58a565f9cdb0097cc16e68a59cd24c /driver | |
| parent | 22cb8212b81266e05498a3243c8aa8dc5f150846 (diff) | |
| download | patches-68c35946496d39baa69fb065b9dc0acf4b9bcbfa.tar.gz | |
actually put the patch back in the series file...
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/kobject-drop-child-parent-ref-at-unregistration.patch | 4 | ||||
| -rw-r--r-- | driver/kobject-warn.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/driver/kobject-drop-child-parent-ref-at-unregistration.patch b/driver/kobject-drop-child-parent-ref-at-unregistration.patch index 959cc948a63fea..36bc26ae2f8d91 100644 --- a/driver/kobject-drop-child-parent-ref-at-unregistration.patch +++ b/driver/kobject-drop-child-parent-ref-at-unregistration.patch @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* be noisy on error issues */ if (error == -EEXIST) -@@ -463,7 +466,6 @@ void kobject_cleanup(struct kobject * ko +@@ -453,7 +456,6 @@ void kobject_cleanup(struct kobject * ko { struct kobj_type * t = get_ktype(kobj); struct kset * s = kobj->kset; @@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> const char *name = kobj->k_name; pr_debug("kobject: '%s' (%p): %s\n", -@@ -477,7 +479,6 @@ void kobject_cleanup(struct kobject * ko +@@ -467,7 +469,6 @@ void kobject_cleanup(struct kobject * ko } if (s) kset_put(s); diff --git a/driver/kobject-warn.patch b/driver/kobject-warn.patch index 842abc670851b1..a3577fde61df58 100644 --- a/driver/kobject-warn.patch +++ b/driver/kobject-warn.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kref_init(&kobj->kref); INIT_LIST_HEAD(&kobj->entry); } -@@ -464,6 +465,10 @@ void kobject_cleanup(struct kobject * ko +@@ -466,6 +467,10 @@ void kobject_cleanup(struct kobject * ko * not a statically allocated kobject, so we should be safe to * free the name */ kfree(name); |