projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c438269)
Revert "[media] staging: omap4iss: copy paste error in iss_get_clocks"
authorMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 26 Aug 2014 18:04:34 +0000 (15:04 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Tue, 26 Aug 2014 21:52:16 +0000 (18:52 -0300)
This patch readded a call to iss_put_clocks(), with was removed
by changeset 1153be56a105, causing a compilation breakage.

This reverts commit d4b32646468088323f27a7788ce3b07191015142.

drivers/staging/media/omap4iss/iss.c patch | blob | blame | history

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 8a23d164e8472e134a39dd84dd93b85bd30e6a32..d548371db65adc1ccc944f6a71794f973c3227c6 100644 (file)
--- 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);
        }