]>
Commit | Line | Data |
---|---|---|
2a2a4ae2 SL |
1 | From bb9eca0112e7dec7a16bf6940f0dd290dc6a517f Mon Sep 17 00:00:00 2001 |
2 | From: Dan Carpenter <dan.carpenter@oracle.com> | |
3 | Date: Mon, 13 May 2019 14:07:18 +0300 | |
4 | Subject: Staging: vc04_services: Fix a couple error codes | |
5 | ||
6 | [ Upstream commit ca4e4efbefbbdde0a7bb3023ea08d491f4daf9b9 ] | |
7 | ||
8 | These are accidentally returning positive EINVAL instead of negative | |
9 | -EINVAL. Some of the callers treat positive values as success. | |
10 | ||
11 | Fixes: 7b3ad5abf027 ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.") | |
12 | Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> | |
13 | Acked-by: Stefan Wahren <stefan.wahren@i2se.com> | |
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
15 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
16 | --- | |
17 | drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++-- | |
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
19 | ||
20 | diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c | |
21 | index 77a5d6f4e1eb..8a242f609d3b 100644 | |
22 | --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c | |
23 | +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c | |
24 | @@ -579,7 +579,7 @@ static int ctrl_set_image_effect(struct bm2835_mmal_dev *dev, | |
25 | dev->colourfx.enable ? "true" : "false", | |
26 | dev->colourfx.u, dev->colourfx.v, | |
27 | ret, (ret == 0 ? 0 : -EINVAL)); | |
28 | - return (ret == 0 ? 0 : EINVAL); | |
29 | + return (ret == 0 ? 0 : -EINVAL); | |
30 | } | |
31 | ||
32 | static int ctrl_set_colfx(struct bm2835_mmal_dev *dev, | |
33 | @@ -603,7 +603,7 @@ static int ctrl_set_colfx(struct bm2835_mmal_dev *dev, | |
34 | "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n", | |
35 | __func__, mmal_ctrl, ctrl->id, ctrl->val, ret, | |
36 | (ret == 0 ? 0 : -EINVAL)); | |
37 | - return (ret == 0 ? 0 : EINVAL); | |
38 | + return (ret == 0 ? 0 : -EINVAL); | |
39 | } | |
40 | ||
41 | static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev, | |
42 | -- | |
43 | 2.20.1 | |
44 |