diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:32 +0100 |
| commit | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (patch) | |
| tree | 7d29e81580cba854042df4e33bdc8f38bbd65d03 /drivers/acpi/power_meter.c | |
| parent | ALSA: AACI: fix recording bug (diff) | |
| parent | Merge branch 'topic/pcm-dma-fix' into topic/core-change (diff) | |
| download | linux-79598324838a25cc378ecbb8c29dd1e3d3951d35.tar.xz linux-79598324838a25cc378ecbb8c29dd1e3d3951d35.zip | |
Merge branch 'topic/core-change' into for-linus
Diffstat (limited to 'drivers/acpi/power_meter.c')
| -rw-r--r-- | drivers/acpi/power_meter.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c index e6bfd77986b8..2ef7030a0c28 100644 --- a/drivers/acpi/power_meter.c +++ b/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, |