On Mon, Apr 06, 2020 at 03:04:36PM -0600, Jeffrey Hugo wrote: > Powerdown is necessary if mhi_sync_power_up fails due to a timeout, to > clean up the resources. Otherwise a BUG could be triggered when > attempting to clean up MSIs because the IRQ is still active from a > request_irq(). > > Signed-off-by: Jeffrey Hugo <jhugo@xxxxxxxxxxxxxx> > --- > drivers/bus/mhi/core/pm.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c > index cd6ba23..1bfa334 100644 > --- a/drivers/bus/mhi/core/pm.c > +++ b/drivers/bus/mhi/core/pm.c > @@ -922,7 +922,11 @@ int mhi_sync_power_up(struct mhi_controller *mhi_cntrl) > MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state), > msecs_to_jiffies(mhi_cntrl->timeout_ms)); > > - return (MHI_IN_MISSION_MODE(mhi_cntrl->ee)) ? 0 : -EIO; > + ret = (MHI_IN_MISSION_MODE(mhi_cntrl->ee)) ? 0 : -EIO; > + > + if (ret) > + mhi_power_down(mhi_cntrl, false); > + return ret; I'd prefer the style of, ``` statement if (cond) statement return ``` Please stick to this. The change itself looks good. Thanks, Mani > } > EXPORT_SYMBOL(mhi_sync_power_up); > > -- > Qualcomm Technologies, Inc. is a member of the > Code Aurora Forum, a Linux Foundation Collaborative Project.
