From: Mauro Carvalho Chehab 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=daf77bd9c21c550252582551ee87e883eed7db00;p=linux-beck.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 Acked-by: Lad, Prabhakar Signed-off-by: Mauro Carvalho Chehab --- 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);