From 1282c632970eb9de611c26a4f34e23ea39a9bc18 Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <djwong@us.ibm.com>
Date: Wed, 21 Oct 2009 18:01:37 -0700
Subject: [PATCH] --- yaml --- r: 168287 b: refs/heads/master c:
 22aecebfd9498c4779e5c5bed1d2d054bd99f7a4 h: refs/heads/master i:   168285:
 be01065eaba35fc8ea55b67132884026f89e196b   168283:
 4596d8dadf3546f20aad7c7c0f9fae1975f005f1   168279:
 cc1aae6536191d63e467767c4526a375190daa81   168271:
 5d65cdefe28beb0a48bce99e7941361988ca5ec6   168255:
 c7a8ffad72edd31cc777ecafa8ee6bcb3bb47e48 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/acpi/power_meter.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 002aebce51e0..0b716df779a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52a2b11cafb1b14bacfc65a20966da5ba3a863e1
+refs/heads/master: 22aecebfd9498c4779e5c5bed1d2d054bd99f7a4
diff --git a/trunk/drivers/acpi/power_meter.c b/trunk/drivers/acpi/power_meter.c
index e6bfd77986b8..2ef7030a0c28 100644
--- a/trunk/drivers/acpi/power_meter.c
+++ b/trunk/drivers/acpi/power_meter.c
@@ -294,7 +294,11 @@ static int set_acpi_trip(struct acpi_power_meter_resource *resource)
 		return -EINVAL;
 	}
 
-	return data;
+	/* _PTP returns 0 on success, nonzero otherwise */
+	if (data)
+		return -EINVAL;
+
+	return 0;
 }
 
 static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,