diff --git a/[refs] b/[refs] index f461a5687c72..18da0edb4b50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 642180871bc91afebb6ccf40d1615a7dd33699a3 +refs/heads/master: 94e792ab66d696aad2e52c91bae4cfbeefe4c9f6 diff --git a/trunk/drivers/tty/serial/8250/8250_em.c b/trunk/drivers/tty/serial/8250/8250_em.c index ff4254249bd8..be6c28937ecc 100644 --- a/trunk/drivers/tty/serial/8250/8250_em.c +++ b/trunk/drivers/tty/serial/8250/8250_em.c @@ -110,8 +110,9 @@ static int __devinit serial8250_em_probe(struct platform_device *pdev) } priv->sclk = clk_get(&pdev->dev, "sclk"); - if (!priv->sclk) { + if (IS_ERR(priv->sclk)) { dev_err(&pdev->dev, "unable to get clock\n"); + ret = PTR_ERR(priv->sclk); goto err1; }