diff options
| author | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-12 18:58:20 +0000 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.org> | 2013-01-17 18:55:06 +0000 |
| commit | 91a73ebb17b716761dea177015e10617ef5d8e0f (patch) | |
| tree | 00abaaef73e5b2e21449a93c51422688cbe7c490 /drivers | |
| parent | b797be24f3bf069ee030b75b8fda0f00dbe89bf1 (diff) | |
| download | kernel_samsung_smdk4412-91a73ebb17b716761dea177015e10617ef5d8e0f.zip kernel_samsung_smdk4412-91a73ebb17b716761dea177015e10617ef5d8e0f.tar.gz kernel_samsung_smdk4412-91a73ebb17b716761dea177015e10617ef5d8e0f.tar.bz2 | |
t0lte: support for galaxy note 2 lte
Change-Id: I9ac93ae5b0746c4b8af0a430180b309638935c49
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/battery/max77693_charger.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/battery/max77693_charger.c b/drivers/battery/max77693_charger.c index 8609e6e..4a147ee 100644 --- a/drivers/battery/max77693_charger.c +++ b/drivers/battery/max77693_charger.c @@ -679,7 +679,8 @@ static int max77693_get_cable_type(struct max77693_charger_data *chg_data) u8 mu_st2, chgdetrun, vbvolt, chgtyp, dxovp; int muic_cb_typ; bool wc_state; - bool retry_det, chg_det_erred; + bool retry_det; + bool chg_det_erred = false; /* TEMP: set as true for logging */ bool otg_detected = false; int retry_cnt = 0; pr_debug("%s\n", __func__); @@ -736,7 +737,6 @@ static int max77693_get_cable_type(struct max77693_charger_data *chg_data) goto chg_det_finish; } - chg_det_erred = false; /* TEMP: set as true for logging */ do { retry_det = false; diff --git a/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c b/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c index 2d47dba..b38fc9b 100644 --- a/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c +++ b/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c @@ -304,7 +304,10 @@ mali_bool set_mali_dvfs_current_step(unsigned int step) static mali_bool set_mali_dvfs_status(u32 step,mali_bool boostup) { u32 validatedStep=step; +#if CPUFREQ_LOCK_DURING_440 int err; +#endif + #ifdef CONFIG_REGULATOR if (mali_regulator_get_usecount() == 0) { @@ -740,7 +743,9 @@ mali_bool mali_dvfs_handler(u32 utilization) int change_dvfs_tableset(int change_clk, int change_step) { +#if CPUFREQ_LOCK_DURING_440 int err; +#endif if (change_clk < mali_dvfs_all[1].clock) { mali_dvfs[change_step].clock = mali_dvfs_all[0].clock; |