On Wed, Aug 1, 2018 at 4:31 PM Matthias Kaehlcke <mka@xxxxxxxxxxxx> wrote: > > Commit 401f1e4490ee ("scsi: ufs: don't suspend clock scaling during > clock gating") introduced a check in ufshcd_hba_exit() to suspend > clock scaling only when the controller supports clock scaling. > However the unconditional call to ufshcd_suspend_clkscaling() was > also left in place, so that it is now called twice when clock > scaling is supported and still once when the controller doesn't > support it. Remove the unconditional call. > > Fixes: 401f1e4490ee ("scsi: ufs: don't suspend clock scaling during clock gating") > Signed-off-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx> > --- > drivers/scsi/ufs/ufshcd.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 397081d320b1..dca7525af696 100644 > --- a/drivers/scsi/ufs/ufshcd.c > +++ b/drivers/scsi/ufs/ufshcd.c > @@ -7186,7 +7186,6 @@ static void ufshcd_hba_exit(struct ufs_hba *hba) > if (hba->is_powered) { > ufshcd_variant_hba_exit(hba); > ufshcd_setup_vreg(hba, false); > - ufshcd_suspend_clkscaling(hba); > if (ufshcd_is_clkscaling_supported(hba)) { > if (hba->devfreq) > ufshcd_suspend_clkscaling(hba); > -- > 2.18.0.597.ga71716f1ad-goog > Reviewed-by: Evan Green <evgreen@xxxxxxxxxxxx>