From 1ef2426c5f2beade3d6407b3eb637210a4177b7a Mon Sep 17 00:00:00 2001 From: Sebastian Hesselbarth Date: Mon, 26 Nov 2012 20:16:39 +0100 Subject: [PATCH] --- yaml --- r: 348472 b: refs/heads/master c: ba607b6238a1f418c45b9d7f73212bcc6922da53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/mvebu/pinctrl-dove.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6054cca73824..fd2eac226897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db7d77e6a7a60dbbac34fe59bc38bc8e7e5e1380 +refs/heads/master: ba607b6238a1f418c45b9d7f73212bcc6922da53 diff --git a/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c b/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c index 40c9c3eecd94..9cc219f61000 100644 --- a/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c +++ b/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c @@ -595,8 +595,11 @@ static int __devinit dove_pinctrl_probe(struct platform_device *pdev) * grab clk to make sure it is ticking. */ clk = devm_clk_get(&pdev->dev, NULL); - if (!IS_ERR(clk)) - clk_prepare_enable(clk); + if (IS_ERR(clk)) { + dev_err(&pdev->dev, "Unable to get pdma clock"); + return PTR_RET(clk); + } + clk_prepare_enable(clk); return mvebu_pinctrl_probe(pdev); }