OSDN Git Service

Staging: vc04_services: Fix a couple error codes
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 13 May 2019 11:07:18 +0000 (14:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 May 2019 07:26:04 +0000 (09:26 +0200)
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 <dan.carpenter@oracle.com>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/bcm2835-camera/controls.c

index 9841c30..dade797 100644 (file)
@@ -572,7 +572,7 @@ exit:
                                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,
@@ -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",
                        __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,