Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[cascardo/linux.git] / drivers / crypto / mxc-scc.c

diff --git a/drivers/crypto/mxc-scc.c b/drivers/crypto/mxc-scc.c
index ff383ef..ee4be1b 100644 (file)
--- a/drivers/crypto/mxc-scc.c
+++ b/drivers/crypto/mxc-scc.c
@@ -668,7 +668,9 @@ static int mxc_scc_probe(struct platform_device *pdev)
                return PTR_ERR(scc->clk);
        }
 
-       clk_prepare_enable(scc->clk);
+       ret = clk_prepare_enable(scc->clk);
+       if (ret)
+               return ret;
 
        /* clear error status register */
        writel(0x0, scc->base + SCC_SCM_ERROR_STATUS);