summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/omap4iss/iss.c
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-07-17 16:20:24 -0300
commit057ef1e56c956b4f68f33c8d0ccd301a0ecb6326 (patch)
treecf754391fa68c874b91c03e3e24697d68443e4ed /drivers/staging/media/omap4iss/iss.c
parent3ed1a0023c48db707db537ef8aeb21445db637a6 (diff)
downloadop-kernel-dev-057ef1e56c956b4f68f33c8d0ccd301a0ecb6326.zip
op-kernel-dev-057ef1e56c956b4f68f33c8d0ccd301a0ecb6326.tar.gz
[media] v4l: 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> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss.c')
-rw-r--r--drivers/staging/media/omap4iss/iss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 2e422dd..4a9e444 100644
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1029,7 +1029,7 @@ static int iss_get_clocks(struct iss_device *iss)
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_fck);
+ return PTR_ERR(iss->iss_ctrlclk);
}
return 0;
OpenPOWER on IntegriCloud