Merge "scsi: ufs: do not destroy clk scaling work queue if it is NULL"

This commit is contained in:
Linux Build Service Account 2018-03-09 02:47:56 -08:00 committed by Gerrit - the friendly Code Review server
commit e6408fea60

View file

@ -3,7 +3,7 @@
* *
* This code is based on drivers/scsi/ufs/ufshcd.c * This code is based on drivers/scsi/ufs/ufshcd.c
* Copyright (C) 2011-2013 Samsung India Software Operations * Copyright (C) 2011-2013 Samsung India Software Operations
* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
* *
* Authors: * Authors:
* Santosh Yaraganavi <santosh.sy@samsung.com> * Santosh Yaraganavi <santosh.sy@samsung.com>
@ -8431,7 +8431,8 @@ static void ufshcd_hba_exit(struct ufs_hba *hba)
if (ufshcd_is_clkscaling_supported(hba)) { if (ufshcd_is_clkscaling_supported(hba)) {
if (hba->devfreq) if (hba->devfreq)
ufshcd_suspend_clkscaling(hba); ufshcd_suspend_clkscaling(hba);
destroy_workqueue(hba->clk_scaling.workq); if (hba->clk_scaling.workq)
destroy_workqueue(hba->clk_scaling.workq);
} }
ufshcd_disable_clocks(hba, false); ufshcd_disable_clocks(hba, false);
ufshcd_setup_hba_vreg(hba, false); ufshcd_setup_hba_vreg(hba, false);