aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/hvc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-11 19:50:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-11 19:50:01 -0400
commit7ec6131b55184084d091953fad9e5c785c5b500b (patch)
tree9c777700e2c237946be8fe775903168f11b77f29 /drivers/tty/hvc
parent4251c2a67011801caecd63671f26dd8c9aedb24c (diff)
parent50b9ac1813f7f2f13c937a1484c2fe09c4d590ce (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile changes from Chris Metcalf: "These mostly just address smaller issues reported to me" * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: arch: tile: kernel: unaligned.c: Cleaning up uninitialized variables drivers/tty/hvc/hvc_tile.c: use PTR_ERR_OR_ZERO replace strict_strto* call with kstrto* tile: Update comments for generic idle conversion tile: cleanup the comment in init_pgprot tile: use BOOTMEM_DEFAULT instead of magic number 0 for reserve_bootmem flags
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r--drivers/tty/hvc/hvc_tile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/hvc/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
index 147d49e95db2..df374860037c 100644
--- 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)
196#ifndef __tilegx__ 196#ifndef __tilegx__
197 struct hvc_struct *hp; 197 struct hvc_struct *hp;
198 hp = hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128); 198 hp = hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
199 return IS_ERR(hp) ? PTR_ERR(hp) : 0; 199 return PTR_ERR_OR_ZERO(hp);
200#else 200#else
201 platform_device_register(&hvc_tile_pdev); 201 platform_device_register(&hvc_tile_pdev);
202 return platform_driver_register(&hvc_tile_driver); 202 return platform_driver_register(&hvc_tile_driver);