summaryrefslogtreecommitdiff
path: root/drivers/hwmon/ams/ams-pmu.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-03-09 19:11:53 +0300
committerIngo Molnar <mingo@elte.hu>2010-03-09 19:11:53 +0300
commit548b84166917d6f5e2296123b85ad24aecd3801d (patch)
tree0ab0300e23a02df0fe3c0579627e4998bb122c00 /drivers/hwmon/ams/ams-pmu.c
parentcfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0 (diff)
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadlinux-548b84166917d6f5e2296123b85ad24aecd3801d.tar.xz
Merge commit 'v2.6.34-rc1' into perf/urgent
Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/hwmon/ams/ams-pmu.c')
-rw-r--r--drivers/hwmon/ams/ams-pmu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
index fb18b3d3162b..4f61b3ee1b08 100644
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -133,6 +133,8 @@ static void ams_pmu_get_xyz(s8 *x, s8 *y, s8 *z)
static void ams_pmu_exit(void)
{
+ ams_sensor_detach();
+
/* Disable interrupts */
ams_pmu_set_irq(AMS_IRQ_ALL, 0);