Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / tty / serial / msm_serial.c

diff --git a/drivers/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
similarity index 99%
rename from drivers/serial/msm_serial.c
rename to drivers/tty/serial/msm_serial.c
index f8c816e7725de2152f9f80b50a0962c6f88c82e4..8e43a7b69e646accf723a020ba8ef5f8a05841d0 100644 (file)
--- a/drivers/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -686,7 +686,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
        msm_port = UART_TO_MSM(port);
 
        msm_port->clk = clk_get(&pdev->dev, "uart_clk");
-       if (unlikely(IS_ERR(msm_port->clk)))
+       if (IS_ERR(msm_port->clk))
                return PTR_ERR(msm_port->clk);
        port->uartclk = clk_get_rate(msm_port->clk);
        printk(KERN_INFO "uartclk = %d\n", port->uartclk);