summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCástor Muñoz <cmvidal@gmail.com>2017-02-04 16:30:08 +0100
committerCástor Muñoz <cmvidal@gmail.com>2017-02-04 16:30:08 +0100
commit96a7603bf9e930a715f7bbb50929975d8d184419 (patch)
treed8833f2c918c3e0b1408a89591e04a6baad06305
parent248bff5eb8c56dc3c8b4ff2e47c05c7c09cd4849 (diff)
downloadrockbox-96a7603bf9e930a715f7bbb50929975d8d184419.tar.gz
rockbox-96a7603bf9e930a715f7bbb50929975d8d184419.tar.bz2
rockbox-96a7603bf9e930a715f7bbb50929975d8d184419.zip
nano2g: fix dangerous mutex in hold switch
This is a quick patch to solve FS#13104, we can not disable the clickwheel LDO from within interrupt code, so for the moment we leave it enabled all the time, it is unknown how power comsumption is affected when the hold switch is locked. Change-Id: I8f675702e2b5becbcd9197c8b044e6b8daeea79f
-rw-r--r--firmware/target/arm/ipod/button-clickwheel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/target/arm/ipod/button-clickwheel.c b/firmware/target/arm/ipod/button-clickwheel.c
index 5b7e10b39a..f9a9284915 100644
--- a/firmware/target/arm/ipod/button-clickwheel.c
+++ b/firmware/target/arm/ipod/button-clickwheel.c
@@ -435,7 +435,7 @@ int button_read_device(void)
/* lock -> disable wheel sensor */
DEV_EN &= ~DEV_OPTO;
#elif CONFIG_CPU==S5L8701
- pmu_ldo_power_off(1); /* disable clickwheel power supply */
+ /*pmu_ldo_power_off(1);*/ /* disable clickwheel power supply */
WHEEL00 = 0;
WHEEL10 = 0;
PWRCONEXT |= 1;
@@ -452,7 +452,7 @@ int button_read_device(void)
DEV_EN |= DEV_OPTO;
opto_i2c_init();
#elif CONFIG_CPU==S5L8701
- pmu_ldo_power_on(1); /* enable clickwheel power supply */
+ /*pmu_ldo_power_on(1);*/ /* enable clickwheel power supply */
s5l_clickwheel_init();
#elif CONFIG_CPU==S5L8702
s5l_clickwheel_init();