From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Date: Wed, 18 Feb 2015 15:04:05 +0000 (-0300)
Subject: [media] tuner-core: fix compilation if the media controller is not defined
X-Git-Tag: firefly_0821_release~176^2~795^2~1376
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=daf77bd9c21c550252582551ee87e883eed7db00;p=firefly-linux-kernel-4.4.55.git

[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>
---

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);