Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvc_tile.c

diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index 147d49e95db2b1a61437581aec0c1bbb6cbf35c6..df374860037cd2c64efe6617b485797b11f3acf9 100644 (file)
--- a/drivers/tty/hvc/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@ -196,7 +196,7 @@ static int __init hvc_tile_init(void)
 #ifndef __tilegx__
        struct hvc_struct *hp;
        hp = hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
-       return IS_ERR(hp) ? PTR_ERR(hp) : 0;
+       return PTR_ERR_OR_ZERO(hp);
 #else
        platform_device_register(&hvc_tile_pdev);
        return platform_driver_register(&hvc_tile_driver);