diff options
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 0ab4ab21f564..691ffb64cc37 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -38,20 +38,14 @@ static DEFINE_MUTEX(dpm_list_mtx); | |||
| 38 | int (*platform_enable_wakeup)(struct device *dev, int is_on); | 38 | int (*platform_enable_wakeup)(struct device *dev, int is_on); |
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | int device_pm_add(struct device *dev) | 41 | void device_pm_add(struct device *dev) |
| 42 | { | 42 | { |
| 43 | int error; | ||
| 44 | |||
| 45 | pr_debug("PM: Adding info for %s:%s\n", | 43 | pr_debug("PM: Adding info for %s:%s\n", |
| 46 | dev->bus ? dev->bus->name : "No Bus", | 44 | dev->bus ? dev->bus->name : "No Bus", |
| 47 | kobject_name(&dev->kobj)); | 45 | kobject_name(&dev->kobj)); |
| 48 | mutex_lock(&dpm_list_mtx); | 46 | mutex_lock(&dpm_list_mtx); |
| 49 | list_add_tail(&dev->power.entry, &dpm_active); | 47 | list_add_tail(&dev->power.entry, &dpm_active); |
| 50 | error = dpm_sysfs_add(dev); | ||
| 51 | if (error) | ||
| 52 | list_del(&dev->power.entry); | ||
| 53 | mutex_unlock(&dpm_list_mtx); | 48 | mutex_unlock(&dpm_list_mtx); |
| 54 | return error; | ||
| 55 | } | 49 | } |
| 56 | 50 | ||
| 57 | void device_pm_remove(struct device *dev) | 51 | void device_pm_remove(struct device *dev) |