mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-09 21:59:12 -04:00
Cypfq: dlkm: Improve gcore_mmi driver
- Add mutex for read touch firmware version. - When upgrading firmware, do not read touch firmware version. Change-Id: I25727899deb0ebb395379d4bdb0330075864044d Signed-off-by: wengjun1 <wengjun1@motorola.com> Reviewed-on: https://gerrit.mot.com/2030589 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Huosheng Liao <liaohs@motorola.com> Submit-Approved: Jira Key
This commit is contained in:
parent
60decaa7d5
commit
d0ec532368
1 changed files with 10 additions and 0 deletions
|
|
@ -28,6 +28,7 @@ struct gcore_dev *gdev_fwu;
|
|||
struct task_struct *fwu_thread;
|
||||
|
||||
DECLARE_COMPLETION(fw_update_complete);
|
||||
u8 g_update_running;
|
||||
|
||||
static int gcore_fw_update_fn_init(struct gcore_dev *gdev);
|
||||
static void gcore_fw_update_fn_remove(struct gcore_dev *gdev);
|
||||
|
|
@ -457,6 +458,7 @@ int gcore_read_fw_version(u8 *version, int length)
|
|||
#endif
|
||||
#endif
|
||||
|
||||
mutex_lock(&gdev_fwu->transfer_lock);
|
||||
gcore_enter_idm_mode();
|
||||
|
||||
msleep(1);
|
||||
|
|
@ -480,7 +482,13 @@ int gcore_read_fw_version(u8 *version, int length)
|
|||
msleep(1);
|
||||
#endif
|
||||
|
||||
if (g_update_running) {
|
||||
GTP_ERROR("fw update is running, do not read version!");
|
||||
return 0;
|
||||
}
|
||||
|
||||
gcore_exit_idm_mode();
|
||||
mutex_unlock(&gdev_fwu->transfer_lock);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
@ -1587,6 +1595,7 @@ void gcore_request_firmware_update_work(struct work_struct *work)
|
|||
#endif
|
||||
|
||||
g_ret_update = 0;
|
||||
g_update_running = 1;
|
||||
|
||||
#ifdef CONFIG_GCORE_AUTO_UPDATE_FW_FLASHDOWNLOAD
|
||||
if (gcore_auto_update_flashdownload_proc(fw_buf)) {
|
||||
|
|
@ -1599,6 +1608,7 @@ void gcore_request_firmware_update_work(struct work_struct *work)
|
|||
#endif
|
||||
|
||||
g_ret_update = 1;
|
||||
g_update_running = 0;
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue