Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 487062ec authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Avoid fatal error if ICE registers are not defined"

parents dec49cd5 adb168de

drivers/mmc/host/cqhci-crypto-qti.c

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ int cqhci_crypto_qti_init_crypto(struct cqhci_host *host, 
	if (!cqhci_ice_memres) {

		pr_debug("%s ICE not supported\n", __func__);

		host->icemmio = NULL;

		return PTR_ERR(cqhci_ice_memres);

		host->caps &= ~CQHCI_CAP_CRYPTO_SUPPORT;

		return err;

	}



	host->icemmio = devm_ioremap(&host->pdev->dev,

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

+3 −1
Original line number Diff line number Diff line
@@ -337,7 +337,9 @@ int ufshcd_crypto_qti_init_crypto(struct ufs_hba *hba, 
	mmio_base = devm_ioremap_resource(hba->dev, mem_res);

	if (IS_ERR(mmio_base)) {

		pr_err("%s: Unable to get ufs_crypto mmio base\n", __func__);

		return PTR_ERR(mmio_base);

		hba->caps &= ~UFSHCD_CAP_CRYPTO;

		hba->quirks |= UFSHCD_QUIRK_BROKEN_CRYPTO;

		return err;

	}



	hwkm_ice_memres = platform_get_resource_byname(pdev, IORESOURCE_MEM,