diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2018-04-12 15:27:50 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2018-04-23 20:58:56 +0300 |
| commit | 5cd770f68a2081849a4c1f140dd4eff8387a3da6 (patch) | |
| tree | b30cc4eacef4ac8bb11a15675957e54d656632c0 /drivers/media/i2c | |
| parent | 65b0ae5e3ee5fccb2311652d91249a1fff3522d8 (diff) | |
| download | linux-5cd770f68a2081849a4c1f140dd4eff8387a3da6.tar.xz | |
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 <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/i2c')
| -rw-r--r-- | drivers/media/i2c/tda1997x.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |