From: Vitaly Osipov <vitaly.osipov@gmail.com>
Date: Thu, 5 Jun 2014 07:07:48 +0000 (-0300)
Subject: [media] v4l: omap4iss: Copy paste error in iss_get_clocks
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=057ef1e56c956b4f68f33c8d0ccd301a0ecb6326;p=deliverable%2Flinux.git

[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>
---

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 2e422dde074e..4a9e444cd622 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;