summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2021-04-20 17:22:10 +0100
committerMarc Zyngier <maz@kernel.org>2021-04-20 17:22:10 +0100
commit4085ae809334f036ec01790d1bac41a8ec3116da (patch)
tree45e8d4a4ac5b722ca5ae44acfb34657c5b0f3ebd /drivers
parent979a265264d18eca756319daeb2b583ac39158bb (diff)
parent182a71a3653c4324672fd87e4384fae2fbd63269 (diff)
Merge branch 'kvm-arm64/ptp' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ptp/ptp_kvm_common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ptp/ptp_kvm_common.c b/drivers/ptp/ptp_kvm_common.c
index 721ddcede5e1..fcae32f56f25 100644
--- a/drivers/ptp/ptp_kvm_common.c
+++ b/drivers/ptp/ptp_kvm_common.c
@@ -138,7 +138,8 @@ static int __init ptp_kvm_init(void)
ret = kvm_arch_ptp_init();
if (ret) {
- pr_err("fail to initialize ptp_kvm");
+ if (ret != -EOPNOTSUPP)
+ pr_err("fail to initialize ptp_kvm");
return ret;
}