diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 16:05:13 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 16:05:13 +0200 |
commit | 7a258ff04f9d5fe549fed6d03931a0236587047e (patch) | |
tree | 6b164332c2a3983d972cc4dc47af3fce6cc5dc32 /drivers/ptp | |
parent | 382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7 (diff) | |
parent | f61143c45077df4fa78e2f1ba455a00bbe1d5b8c (diff) | |
download | blackbird-obmc-linux-7a258ff04f9d5fe549fed6d03931a0236587047e.tar.gz blackbird-obmc-linux-7a258ff04f9d5fe549fed6d03931a0236587047e.zip |
Merge branch 'linus' into irq/core
Pick up upstream fixes to avoid conflicts with pending patches.
Diffstat (limited to 'drivers/ptp')
-rw-r--r-- | drivers/ptp/ptp_kvm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm.c index 09b4df74291e..bb865695d7a6 100644 --- a/drivers/ptp/ptp_kvm.c +++ b/drivers/ptp/ptp_kvm.c @@ -193,10 +193,7 @@ static int __init ptp_kvm_init(void) kvm_ptp_clock.ptp_clock = ptp_clock_register(&kvm_ptp_clock.caps, NULL); - if (IS_ERR(kvm_ptp_clock.ptp_clock)) - return PTR_ERR(kvm_ptp_clock.ptp_clock); - - return 0; + return PTR_ERR_OR_ZERO(kvm_ptp_clock.ptp_clock); } module_init(ptp_kvm_init); |