summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 15:04:34 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 18:52:16 -0300
commit821ee47e0ef589c75c0c10411463c8cd795afafb (patch)
treea0db2be082027de7f122fc71e5ba39eb245cfb1c /drivers/staging
parentc438269948c420518101a836b526f71d389f80dd (diff)
downloadlinux-stable-821ee47e0ef589c75c0c10411463c8cd795afafb.tar.gz
linux-stable-821ee47e0ef589c75c0c10411463c8cd795afafb.tar.bz2
linux-stable-821ee47e0ef589c75c0c10411463c8cd795afafb.zip
Revert "[media] staging: omap4iss: copy paste error in iss_get_clocks"
This patch readded a call to iss_put_clocks(), with was removed by changeset 1153be56a105, causing a compilation breakage. This reverts commit d4b32646468088323f27a7788ce3b07191015142.
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/media/omap4iss/iss.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 8a23d164e847..d548371db65a 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1014,7 +1014,6 @@ 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);
}