Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd9b6de7 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

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: 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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 97605ba6

drivers/staging/vc04_services/bcm2835-camera/controls.c

+2 −2
Original line number Diff line number Diff line
@@ -576,7 +576,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,
@@ -600,7 +600,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,