p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Staging: vc04_services: Fix a couple error codes 

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

Fixes: 7b3ad5abf0 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2019-05-13 14:07:18 +03:00 committed by Greg Kroah-Hartman
parent a67fedd788
commit ca4e4efbef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vc04_services/bcm2835-camera/controls.c
View File

@ -572,7 +572,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev,
dev->colourfx.enable ? "true" : "false", dev->colourfx.enable ? "true" : "false",
dev->colourfx.u, dev->colourfx.v, dev->colourfx.u, dev->colourfx.v,
ret, (ret == 0 ? 0 : -EINVAL)); 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, static int ctrl_set_colfx(struct bm2835_mmal_dev *dev,
@ -596,7 +596,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", "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
__func__, mmal_ctrl, ctrl->id, ctrl->val, ret, __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
(ret == 0 ? 0 : -EINVAL)); (ret == 0 ? 0 : -EINVAL));
return (ret == 0 ? 0 : EINVAL); return (ret == 0 ? 0 : -EINVAL);
} }
static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,