diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-09 02:47:56 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-09 02:47:56 -0800 |
| commit | e6408fea602f42dd516ee9ec0ffde2a6df9a839d (patch) | |
| tree | 1345d6a55ab91ae791b24ace5af32a92c0ef9be8 | |
| parent | 4e755a752ec16ac0d62e9cd5784742d5d32e2abf (diff) | |
| parent | 8a7e59ba7f4b39a2d3e83b21293c6fe3d4d1db59 (diff) | |
Merge "scsi: ufs: do not destroy clk scaling work queue if it is NULL"
| -rw-r--r-- | drivers/scsi/ufs/ufshcd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 9bf7f57d9a17..10021f25afdd 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -3,7 +3,7 @@ * * This code is based on drivers/scsi/ufs/ufshcd.c * 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: * 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 (hba->devfreq) 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_setup_hba_vreg(hba, false); |