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,