Merge branch '6.9/scsi-queue' into 6.9/scsi-fixes

[sfrench/cifs-2.6.git] / drivers / ufs / host / ufs-qcom.c

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 8d68bd21ae7332409198b06d7c99d2f7e6faaafe..06859e17b67b7777a08d7e5e33b1bfb972cdd6c3 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1210,8 +1210,10 @@ static int ufs_qcom_set_core_clk_ctrl(struct ufs_hba *hba, bool is_scale_up)
 
        list_for_each_entry(clki, head, list) {
                if (!IS_ERR_OR_NULL(clki->clk) &&
-                       !strcmp(clki->name, "core_clk_unipro")) {
-                       if (is_scale_up)
+                   !strcmp(clki->name, "core_clk_unipro")) {
+                       if (!clki->max_freq)
+                               cycles_in_1us = 150; /* default for backwards compatibility */
+                       else if (is_scale_up)
                                cycles_in_1us = ceil(clki->max_freq, (1000 * 1000));
                        else
                                cycles_in_1us = ceil(clk_get_rate(clki->clk), (1000 * 1000));