A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-07 04:12:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: pil: Disable error-ready timeout"

Browse source
This commit is contained in:
qctecmdr 2020-01-16 10:53:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit 059aa413d9
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/soc/qcom/subsystem_restart.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "subsys-restart: %s(): " fmt, __func__
@ -682,8 +682,6 @@ static void disable_all_irqs(struct subsys_device *dev)
static int wait_for_err_ready(struct subsys_device *subsys)
{
int ret;
/*
* If subsys is using generic_irq in which case err_ready_irq will be 0,
* don't return.
@ -692,14 +690,7 @@ static int wait_for_err_ready(struct subsys_device *subsys)
enable_debug == 1)
return 0;
ret = wait_for_completion_timeout(&subsys->err_ready,
msecs_to_jiffies(10000));
if (!ret) {
pr_err("[%s]: Error ready timed out\n", subsys->desc->name);
return -ETIMEDOUT;
}
return 0;
return wait_for_completion_interruptible(&subsys->err_ready);
}
static int subsystem_shutdown(struct subsys_device *dev, void *data)