[media] v4l: omap4iss: Copy paste error in iss_get_clocks
authorVitaly Osipov <vitaly.osipov@gmail.com>
Thu, 5 Jun 2014 07:07:48 +0000 (04:07 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 17 Jul 2014 19:20:24 +0000 (16:20 -0300)
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>
drivers/staging/media/omap4iss/iss.c

index 2e422dde074ee4e048b3f730a93f78816510ad30..4a9e444cd622f2a2fbe3c9fade49b3cc54e8960b 100644 (file)
@@ -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;