aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Osipov <vitaly.osipov@gmail.com>2014-06-05 04:07:48 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-21 15:25:34 -0500
commitd4b32646468088323f27a7788ce3b07191015142 (patch)
tree0d8802f5e7ceda9395c97ad8ddef65a3095a5854
parent63ddf68de52efaac40a9287e44266ac30e71dd36 (diff)
[media] staging: omap4iss: copy paste error in iss_get_clocks
It makes more sense to return PTR_ERR(iss->iss_ctrlclk) here. The current code looks like an oversight in pasting the block just above this one. Signed-off-by: Vitaly Osipov <vitaly.osipov@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/staging/media/omap4iss/iss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index d548371db65a..8a23d164e847 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1014,6 +1014,7 @@ static int iss_get_clocks(struct iss_device *iss)
iss->iss_ctrlclk = devm_clk_get(iss->dev, "iss_ctrlclk");
if (IS_ERR(iss->iss_ctrlclk)) {
dev_err(iss->dev, "Unable to get iss_ctrlclk clock info\n");
+ iss_put_clocks(iss);
return PTR_ERR(iss->iss_ctrlclk);
}

Privacy Policy