diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-04-04 18:34:30 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-04-04 18:34:31 +0300 |
| commit | 9eb8902e278f3314e1e9429c5f13db9e7a7a0cff (patch) | |
| tree | 4c37354471b909f07c02726eba22caa56a910108 /drivers/ptp/ptp_kvm.c | |
| parent | c829a33253e018472335b02e6d8bb1bb4213a142 (diff) | |
| parent | 3c2507d308afb233dd41387b41512e7aa97535f0 (diff) | |
| download | linux-9eb8902e278f3314e1e9429c5f13db9e7a7a0cff.tar.xz | |
Merge tag 'topic/synopsys-media-formats-2017-04-03' of git://anongit.freedesktop.org/git/drm-misc into drm-misc-next
Media formats for synopsys HDMI TX Controller
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay
Diffstat (limited to 'drivers/ptp/ptp_kvm.c')
| -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); |