diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-04 04:30:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-04 04:30:55 -0700 |
| commit | d56749a4f930beb22550f93dbf77bf886111f3ee (patch) | |
| tree | 88b6446a4f170d8c90033f22be666df2e92c91f4 /drivers/input | |
| parent | c053ae31b8274d13695cfae19eba1c5627b5a2aa (diff) | |
| parent | 4d9f4b1b844d9e3336a5dd1d14b0dd8650592181 (diff) | |
Merge "hbtp_inpu.c: add 800s power down uevent in suspend func"
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/misc/hbtp_input.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/input/misc/hbtp_input.c b/drivers/input/misc/hbtp_input.c index 9a4b07c8cf60..ca6286a36604 100644 --- a/drivers/input/misc/hbtp_input.c +++ b/drivers/input/misc/hbtp_input.c @@ -1264,28 +1264,28 @@ static int hbtp_fb_suspend(struct hbtp_data *ts) goto err_power_disable; } ts->power_suspended = true; + } - if (ts->input_dev) { - kobject_uevent_env(&ts->input_dev->dev.kobj, - KOBJ_OFFLINE, envp); + if (ts->input_dev) { + kobject_uevent_env(&ts->input_dev->dev.kobj, + KOBJ_OFFLINE, envp); - if (ts->power_sig_enabled) { - pr_debug("%s: power_sig is enabled, wait for signal\n", - __func__); - mutex_unlock(&hbtp->mutex); - rc = wait_for_completion_interruptible( - &hbtp->power_suspend_sig); - if (rc != 0) { - pr_err("%s: wait for suspend is interrupted\n", - __func__); - } - mutex_lock(&hbtp->mutex); - pr_debug("%s: Wait is done for suspend\n", - __func__); - } else { - pr_debug("%s: power_sig is NOT enabled", + if (ts->power_sig_enabled) { + pr_debug("%s: power_sig is enabled, wait for signal\n", + __func__); + mutex_unlock(&hbtp->mutex); + rc = wait_for_completion_interruptible( + &hbtp->power_suspend_sig); + if (rc != 0) { + pr_err("%s: wait for suspend is interrupted\n", __func__); } + mutex_lock(&hbtp->mutex); + pr_debug("%s: Wait is done for suspend\n", + __func__); + } else { + pr_debug("%s: power_sig is NOT enabled", + __func__); } } |
