Staging: vc04_services: Fix a couple error codes [Linux 4.14.129]

Staging: vc04_services: Fix a couple error codes [Linux 4.14.129]

This Linux kernel change "Staging: vc04_services: Fix a couple error codes" is included in the Linux 4.14.129 release. This change is authored by Dan Carpenter <dan.carpenter [at] oracle.com> on Mon May 13 14:07:18 2019 +0300. The commit for this change in Linux stable tree is f1c62cd (patch) which is from upstream commit ca4e4ef. The same Linux upstream change may have been applied to various maintained Linux releases and you can find all Linux releases containing changes from upstream ca4e4ef.

Staging: vc04_services: Fix a couple error codes

[ Upstream commit ca4e4efbefbbdde0a7bb3023ea08d491f4daf9b9 ]

These are accidentally returning positive EINVAL instead of negative
-EINVAL.  Some of the callers treat positive values as success.

Fixes: 7b3ad5abf027 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: Dan Carpenter <[email protected]>
Acked-by: Stefan Wahren <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>

There are 4 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index 77a5d6f..8a242f6 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -579,7 +579,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
                dev->colourfx.enable ? "true" : "false",
                dev->colourfx.u, dev->colourfx.v,
                ret, (ret == 0 ? 0 : -EINVAL));
-   return (ret == 0 ? 0 : EINVAL);
+   return (ret == 0 ? 0 : -EINVAL);
 }

 static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
@@ -603,7 +603,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
         "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
            __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
            (ret == 0 ? 0 : -EINVAL));
-   return (ret == 0 ? 0 : EINVAL);
+   return (ret == 0 ? 0 : -EINVAL);
 }

 static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,

Leave a Reply

Your email address will not be published. Required fields are marked *