Commit ca4e4efb authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

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: 7b3ad5ab ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a67fedd7
...@@ -572,7 +572,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev, ...@@ -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, ...@@ -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,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment