summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarie-Celine Dubut <marie.celinex.dubut@intel.com>2012-06-11 10:57:14 +0200
committerDubut, Marie CelineX <marie.celinex.dubut@intel.com>2012-06-11 02:03:54 -0700
commit01508495cbfc80e2a67578c833f44d28bc567e94 (patch)
treedf7bc9070f6851ac20a9f9cf0cf94c248f56b67f
parent81dfde0d207ea602364c140ce83f55ef103a223c (diff)
downloadkernel-mfld-blackbay-01508495cbfc80e2a67578c833f44d28bc567e94.tar.gz
kernel-mfld-blackbay-01508495cbfc80e2a67578c833f44d28bc567e94.tar.bz2
kernel-mfld-blackbay-01508495cbfc80e2a67578c833f44d28bc567e94.zip
Revert "hwmon: Change late resume priority to enable gfx first"
BZ: 37619 This reverts commit 2aa1c6020d920a6e77c967f7428db328c89536b5. This reverts patch http://android.intel.com:8080/#/c/51961/ Change-Id: I361acce85160f5a761651c8710d4c8a37fc4f9fc Signed-off-by: Marie-Celine Dubut <marie.celinex.dubut@intel.com> Reviewed-on: http://android.intel.com:8080/52298
-rw-r--r--drivers/hwmon/hmc5883.c2
-rw-r--r--drivers/hwmon/lis3dh_acc.c2
-rw-r--r--drivers/hwmon/ltr502als.c2
-rw-r--r--drivers/hwmon/mpu3050.c2
-rw-r--r--drivers/hwmon/ms5607.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/hmc5883.c b/drivers/hwmon/hmc5883.c
index 498030d9ec5..b932516d0a5 100644
--- a/drivers/hwmon/hmc5883.c
+++ b/drivers/hwmon/hmc5883.c
@@ -425,7 +425,7 @@ hmc5883_probe(struct i2c_client *client, const struct i2c_device_id *id)
}
#ifdef CONFIG_HAS_EARLYSUSPEND
- hmc5883->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10;
+ hmc5883->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 10;
hmc5883->es.suspend = hmc5883_early_suspend;
hmc5883->es.resume = hmc5883_late_resume;
register_early_suspend(&hmc5883->es);
diff --git a/drivers/hwmon/lis3dh_acc.c b/drivers/hwmon/lis3dh_acc.c
index 2be9fbcdfe2..e37409a028a 100644
--- a/drivers/hwmon/lis3dh_acc.c
+++ b/drivers/hwmon/lis3dh_acc.c
@@ -1210,7 +1210,7 @@ static int lis3dh_acc_probe(struct i2c_client *client,
lis3dh_acc_disable(acc);
#ifdef CONFIG_HAS_EARLYSUSPEND
- acc->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10;
+ acc->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 10;
acc->es.suspend = lis3dh_early_suspend;
acc->es.resume = lis3dh_late_resume;
register_early_suspend(&acc->es);
diff --git a/drivers/hwmon/ltr502als.c b/drivers/hwmon/ltr502als.c
index 2db3cd9ee74..b490fcda40a 100644
--- a/drivers/hwmon/ltr502als.c
+++ b/drivers/hwmon/ltr502als.c
@@ -817,7 +817,7 @@ static int __init ltr502als_probe(struct i2c_client *client,
}
#ifdef CONFIG_HAS_EARLYSUSPEND
- alsps->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10;
+ alsps->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 10;
alsps->es.suspend = alsps_early_suspend;
alsps->es.resume = alsps_late_resume;
#endif
diff --git a/drivers/hwmon/mpu3050.c b/drivers/hwmon/mpu3050.c
index 9d33df89568..ec9798800f7 100644
--- a/drivers/hwmon/mpu3050.c
+++ b/drivers/hwmon/mpu3050.c
@@ -680,7 +680,7 @@ static int __devinit mpu_probe(struct i2c_client *client,
}
#ifdef CONFIG_HAS_EARLYSUSPEND
- mpu->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10;
+ mpu->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 10;
mpu->es.suspend = mpu_early_suspend;
mpu->es.resume = mpu_late_resume;
register_early_suspend(&mpu->es);
diff --git a/drivers/hwmon/ms5607.c b/drivers/hwmon/ms5607.c
index deb1e616ccc..ce4e5dfead2 100644
--- a/drivers/hwmon/ms5607.c
+++ b/drivers/hwmon/ms5607.c
@@ -446,7 +446,7 @@ static int __devinit ms5607_probe(struct i2c_client *client,
ms5607->enabled = 0;
#ifdef CONFIG_HAS_EARLYSUSPEND
- ms5607->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB - 10;
+ ms5607->es.level = EARLY_SUSPEND_LEVEL_DISABLE_FB + 10;
ms5607->es.suspend = ms5607_early_suspend;
ms5607->es.resume = ms5607_late_resume;
register_early_suspend(&ms5607->es);