From: Sakari Ailus Date: Thu, 12 Apr 2018 12:27:50 +0000 (-0400) Subject: media: tda1997x: Use bitwise or for setting subdev flags X-Git-Tag: android-x86-8.1-r1~932^2~342 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5cd770f68a2081849a4c1f140dd4eff8387a3da6;p=android-x86%2Fkernel.git media: tda1997x: Use bitwise or for setting subdev flags Assigning subdev flags in probe() after v4l2_i2c_subdev_init() clears the I2C flag set by that function. Fix this by using bitwise or instead. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index 3021913c28fa..1c5b5f70866f 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -2567,7 +2567,7 @@ static int tda1997x_probe(struct i2c_client *client, snprintf(sd->name, sizeof(sd->name), "%s %d-%04x", id->name, i2c_adapter_id(client->adapter), client->addr); - sd->flags = V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; + sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; sd->entity.function = MEDIA_ENT_F_DTV_DECODER; sd->entity.ops = &tda1997x_media_ops;