Merge "scsi: ufshcd-crypto-qti.c: do not resume for key reprogram" (5244792f) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/scsi/ufs/ufshcd-crypto-qti.c

+8 −10

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ void ufshcd_crypto_qti_enable(struct ufs_hba *hba)
		}

		ufshcd_crypto_enable_spec(hba);

		}

		void ufshcd_crypto_qti_disable(struct ufs_hba *hba)
		@@ -96,26 +95,25 @@ static int ufshcd_crypto_qti_keyslot_program(struct keyslot_manager *ksm,
		hba->crypto_cap_array[crypto_alg_id].sdus_mask))
		return -EINVAL;

		if (!hba->pm_op_in_progress)
		pm_runtime_get_sync(hba->dev);
		err = ufshcd_hold(hba, false);
		if (err) {
		pr_err("%s: failed to enable clocks, err %d\n", __func__, err);
		return err;
		goto out;
		}

		err = crypto_qti_keyslot_program(hba->crypto_vops->priv, key, slot,
		data_unit_mask, crypto_alg_id);
		if (err) {
		if (err)
		pr_err("%s: failed with error %d\n", __func__, err);
		ufshcd_release(hba, false);
		pm_runtime_put_sync(hba->dev);
		return err;
		}

		ufshcd_release(hba, false);
		pm_runtime_put_sync(hba->dev);

		return 0;
		out:
		if (!hba->pm_op_in_progress)
		pm_runtime_put_sync(hba->dev);
		return err;
		}

		static int ufshcd_crypto_qti_keyslot_evict(struct keyslot_manager *ksm,