From 3bb9a4fc3c18f6f3ab6f680c94c3b6e2f3d4e644 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 2 Dec 2012 05:10:44 -0500 Subject: [PATCH] --- yaml --- r: 348903 b: refs/heads/master c: a6dd114e16cbc4410049a90a8a67b967333d108d h: refs/heads/master i: 348901: 77f23709a2339c1733d9a72b12fda1c2f829de3e 348899: f058f991cb761d96628920e69fbefca015917625 348895: 6d89fae7d00e6eb8da76da5e78ae9e72615fde2d v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/vt8500_serial.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 781b81769e8b..6ac6f104d972 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87b8bed2ce9394870a87e4fb2aef6752b2bd837d +refs/heads/master: a6dd114e16cbc4410049a90a8a67b967333d108d diff --git a/trunk/drivers/tty/serial/vt8500_serial.c b/trunk/drivers/tty/serial/vt8500_serial.c index 8fd181436a6b..d5ed9f613005 100644 --- a/trunk/drivers/tty/serial/vt8500_serial.c +++ b/trunk/drivers/tty/serial/vt8500_serial.c @@ -604,7 +604,7 @@ static int vt8500_serial_probe(struct platform_device *pdev) vt8500_port->uart.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; vt8500_port->clk = of_clk_get(pdev->dev.of_node, 0); - if (vt8500_port->clk) { + if (!IS_ERR(vt8500_port->clk)) { vt8500_port->uart.uartclk = clk_get_rate(vt8500_port->clk); } else { /* use the default of 24Mhz if not specified and warn */