From 28b9d922d8b8bca51cd28da5a8524e14cb847af3 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Mon, 2 Apr 2012 14:19:04 -0400
Subject: [PATCH] --- yaml --- r: 305857 b: refs/heads/master c:
 7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8 h: refs/heads/master i:   305855:
 9128122ccb9a5302815a4254e28b1d661c93d3b6 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/hwmon/acpi_power_meter.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e697df39212e..819d73690e61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fe789f88ae5488d8b8af1c4c962e619ed05bb2e
+refs/heads/master: 7bb5ee0169b80d40aa7d4854c07f1c2a90efc5b8
diff --git a/trunk/drivers/hwmon/acpi_power_meter.c b/trunk/drivers/hwmon/acpi_power_meter.c
index c3f3058a7099..34ad5a27a7e9 100644
--- a/trunk/drivers/hwmon/acpi_power_meter.c
+++ b/trunk/drivers/hwmon/acpi_power_meter.c
@@ -697,21 +697,20 @@ static int setup_attrs(struct acpi_power_meter_resource *resource)
 			goto skip_unsafe_cap;
 		}
 
-		if (resource->caps.configurable_cap) {
+		if (resource->caps.configurable_cap)
 			res = register_attrs(resource, rw_cap_attrs);
-			if (res)
-				goto error;
-		} else {
+		else
 			res = register_attrs(resource, ro_cap_attrs);
-			if (res)
-				goto error;
-		}
+
+		if (res)
+			goto error;
+
 		res = register_attrs(resource, misc_cap_attrs);
 		if (res)
 			goto error;
 	}
-skip_unsafe_cap:
 
+skip_unsafe_cap:
 	if (resource->caps.flags & POWER_METER_CAN_TRIP) {
 		res = register_attrs(resource, trip_attrs);
 		if (res)