summaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/tuner-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-18 12:04:05 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-26 08:44:04 -0300
commitdaf77bd9c21c550252582551ee87e883eed7db00 (patch)
tree325791372d2b2be03d5561417b8c0d72959dcbd2 /drivers/media/v4l2-core/tuner-core.c
parent63ba8c75188e1122bd5c4a19321d1913367010c6 (diff)
downloadblackbird-op-linux-daf77bd9c21c550252582551ee87e883eed7db00.tar.gz
blackbird-op-linux-daf77bd9c21c550252582551ee87e883eed7db00.zip
[media] tuner-core: fix compilation if the media controller is not defined
drivers/media/v4l2-core/tuner-core.c:440:7: error: 'struct v4l2_subdev' has no member named 'entity' t->sd.entity.name = t->name; Reported-by: kbuild test robot <fengguang.wu@intel.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/tuner-core.c')
-rw-r--r--drivers/media/v4l2-core/tuner-core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 9a83b27a7e8f..abdcffabcb59 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -437,7 +437,9 @@ static void set_type(struct i2c_client *c, unsigned int type,
t->name = analog_ops->info.name;
}
+#ifdef CONFIG_MEDIA_CONTROLLER
t->sd.entity.name = t->name;
+#endif
tuner_dbg("type set to %s\n", t->name);
OpenPOWER on IntegriCloud