diff --git a/[refs] b/[refs]
index f94ffee7502b..ab5b97412b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5678596c7628e47e022d1d30fb2a6c9607f42a0e
+refs/heads/master: ddc07ef9499509200033be7e387feb6c83744a73
diff --git a/trunk/drivers/clk/clk-twl6040.c b/trunk/drivers/clk/clk-twl6040.c
index f4a3389c3d09..bc1e713e7b9c 100644
--- a/trunk/drivers/clk/clk-twl6040.c
+++ b/trunk/drivers/clk/clk-twl6040.c
@@ -92,8 +92,8 @@ static int __devinit twl6040_clk_probe(struct platform_device *pdev)
 
 	clkdata->mcpdm_fclk.init = &wm831x_clkout_init;
 	clkdata->clk = clk_register(&pdev->dev, &clkdata->mcpdm_fclk);
-	if (!clkdata->clk)
-		return -EINVAL;
+	if (IS_ERR(clkdata->clk))
+		return PTR_ERR(clkdata->clk);
 
 	dev_set_drvdata(&pdev->dev, clkdata);