diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2007-04-11 01:37:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-11 18:39:39 -0400 |
commit | c48ea60359a303f3faf5991205b0cdb58dfe6eed (patch) | |
tree | ccccfdc5ff0b88d83d7b4047d819fba2d41b6d4b /drivers/base/power/main.c | |
parent | 5ab7ffea520948115a51a9931e1bb4c818aa8e35 (diff) |
[PATCH] PM: use kobject_name() to access kobject names
Noone should use kobj.name directly since it may contain garbage.
Objects with longer names have them stored in separately allocated
memory pointed to by kobj->k_name.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/base/power/main.c')
-rw-r--r-- | drivers/base/power/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index fdfa3d0cf6af..bbbb973a9d3c 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
@@ -54,7 +54,8 @@ int device_pm_add(struct device * dev) | |||
54 | int error; | 54 | int error; |
55 | 55 | ||
56 | pr_debug("PM: Adding info for %s:%s\n", | 56 | pr_debug("PM: Adding info for %s:%s\n", |
57 | dev->bus ? dev->bus->name : "No Bus", dev->kobj.name); | 57 | dev->bus ? dev->bus->name : "No Bus", |
58 | kobject_name(&dev->kobj)); | ||
58 | down(&dpm_list_sem); | 59 | down(&dpm_list_sem); |
59 | list_add_tail(&dev->power.entry, &dpm_active); | 60 | list_add_tail(&dev->power.entry, &dpm_active); |
60 | device_pm_set_parent(dev, dev->parent); | 61 | device_pm_set_parent(dev, dev->parent); |
@@ -67,7 +68,8 @@ int device_pm_add(struct device * dev) | |||
67 | void device_pm_remove(struct device * dev) | 68 | void device_pm_remove(struct device * dev) |
68 | { | 69 | { |
69 | pr_debug("PM: Removing info for %s:%s\n", | 70 | pr_debug("PM: Removing info for %s:%s\n", |
70 | dev->bus ? dev->bus->name : "No Bus", dev->kobj.name); | 71 | dev->bus ? dev->bus->name : "No Bus", |
72 | kobject_name(&dev->kobj)); | ||
71 | down(&dpm_list_sem); | 73 | down(&dpm_list_sem); |
72 | dpm_sysfs_remove(dev); | 74 | dpm_sysfs_remove(dev); |
73 | put_device(dev->power.pm_parent); | 75 | put_device(dev->power.pm_parent); |