]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
media: v4l2-ctrls: Don't validate BITMASK twice
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 3 Nov 2017 13:35:39 +0000 (09:35 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 7 Nov 2017 10:52:24 +0000 (05:52 -0500)
There is no need to repeat what check_range() does for us, i.e. BITMASK
validation in v4l2_ctrl_new().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/v4l2-core/v4l2-ctrls.c

index c230bd5c655890b23557924933215c257649febb..cbb2ef43945fa010366bb95b9fe89912fec1f9dc 100644 (file)
@@ -2013,10 +2013,6 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
                handler_set_err(hdl, err);
                return NULL;
        }
-       if (type == V4L2_CTRL_TYPE_BITMASK && ((def & ~max) || min || step)) {
-               handler_set_err(hdl, -ERANGE);
-               return NULL;
-       }
        if (is_array &&
            (type == V4L2_CTRL_TYPE_BUTTON ||
             type == V4L2_CTRL_TYPE_CTRL_CLASS)) {