From 68a03041a71d8d3154d3871334bf095fe4f0ef17 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:55 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: iommu: Harden __pkvm_iommu_pm_notify" This reverts commit 0c292fa8d620adf216bc7905b987e28d927b0621. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I39c4f3ff6a0094117fe979378aed19814dc645a0 --- arch/arm64/kvm/hyp/nvhe/iommu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/iommu.c b/arch/arm64/kvm/hyp/nvhe/iommu.c index 2fed6433e065..9b659abc7957 100644 --- a/arch/arm64/kvm/hyp/nvhe/iommu.c +++ b/arch/arm64/kvm/hyp/nvhe/iommu.c @@ -360,12 +360,10 @@ int __pkvm_iommu_pm_notify(unsigned long dev_id, enum pkvm_iommu_pm_event event) if (dev) { if (event == PKVM_IOMMU_PM_SUSPEND) { ret = dev->ops->suspend ? dev->ops->suspend(dev) : 0; - if (!ret) - dev->powered = false; + dev->powered = !!ret; } else if (event == PKVM_IOMMU_PM_RESUME) { ret = dev->ops->resume ? dev->ops->resume(dev) : 0; - if (!ret) - dev->powered = true; + dev->powered = !ret; } else { ret = -EINVAL; }