From fb9578d2bba091d1a4dd14cd16805cab546c1f8f Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 26 Dec 2012 13:26:46 +0100 Subject: [PATCH] --- yaml --- r: 348342 b: refs/heads/master c: 0271f4f1176d7205b2b73ef956b169db8f417932 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/power.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 708f8412d8df..5a22b59647d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23415eb5233eb3c1939c4cb7d6235af98a3a2955 +refs/heads/master: 0271f4f1176d7205b2b73ef956b169db8f417932 diff --git a/trunk/drivers/acpi/power.c b/trunk/drivers/acpi/power.c index 7db61b8fa11f..6e7b9d523812 100644 --- a/trunk/drivers/acpi/power.c +++ b/trunk/drivers/acpi/power.c @@ -445,11 +445,8 @@ int acpi_power_resource_register_device(struct device *dev, acpi_handle handle) return -ENODEV; ret = acpi_bus_get_device(handle, &acpi_dev); - if (ret) - goto no_power_resource; - - if (!acpi_dev->power.flags.power_resources) - goto no_power_resource; + if (ret || !acpi_dev->power.flags.power_resources) + return -ENODEV; powered_device = kzalloc(sizeof(*powered_device), GFP_KERNEL); if (!powered_device) @@ -471,10 +468,6 @@ int acpi_power_resource_register_device(struct device *dev, acpi_handle handle) } return ret; - -no_power_resource: - printk(KERN_DEBUG PREFIX "Invalid Power Resource to register!\n"); - return -ENODEV; } EXPORT_SYMBOL_GPL(acpi_power_resource_register_device);