iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: v4l: fwnode: Only zero the struct if bus type is set to V4L2_MBUS_UNKNOWN

Browse Source 
In order to prepare for allowing drivers to set the defaults for a given
bus, make zeroing the struct conditional based on detecting the bus.
All callers now set the bus type to zero which allows only zeroing the
remaining bus union.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Sakari Ailus 2018-07-31 05:21:53 -04:00 committed by Mauro Carvalho Chehab
parent 60359a28d5
commit 9a5b4b76f3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/v4l2-core/v4l2-fwnode.c
View File

@ -301,6 +301,12 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
u32 bus_type = 0;
int rval;
if (vep->bus_type == V4L2_MBUS_UNKNOWN) {
/* Zero fields from bus union to until the end */
memset(&vep->bus, 0,
sizeof(*vep) - offsetof(typeof(*vep), bus));
}
pr_debug("===== begin V4L2 endpoint properties\n");
/*
@ -309,10 +315,6 @@ static int __v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
*/
memset(&vep->base, 0, sizeof(vep->base));
/* Zero fields from bus_type to until the end */
memset(&vep->bus_type, 0, sizeof(*vep) -
offsetof(typeof(*vep), bus_type));
fwnode_property_read_u32(fwnode, "bus-type", &bus_type);
switch (bus_type) {