A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2021-05-27 02:31:42 -07:00 • committed by Gerrit - the friendly Code Review server
commit 487062ec55
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/mmc/host/cqhci-crypto-qti.c
View file

@ -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,

4
drivers/scsi/ufs/ufshcd-crypto-qti.c
View file

@ -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,