summaryrefslogtreecommitdiffstats
path: root/drivers/media/v4l2-core/v4l2-flash-led-class.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-09-06 09:33:39 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-01-11 12:19:00 -0200
commit0e576b76f5470a2f8b2287958a2b9a3dd0f56f10 (patch)
tree8c35b42290ca39072a406e44e20970174b7dfe80 /drivers/media/v4l2-core/v4l2-flash-led-class.c
parent77328043d9e6feb12e53a4fc5485cf664d2878e4 (diff)
downloadlinux-stable-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.tar.gz
linux-stable-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.tar.bz2
linux-stable-0e576b76f5470a2f8b2287958a2b9a3dd0f56f10.zip
[media] media-entity.h: rename entity.type to entity.function
Entities should have one or more functions. Calling it as a type proofed to not be correct, as an entity could eventually have more than one type. So, rename the field as function. Please notice that this patch doesn't extend support for multiple function entities. Such change will happen when we have real case drivers using it. No functional changes. Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-flash-led-class.c')
-rw-r--r--drivers/media/v4l2-core/v4l2-flash-led-class.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-flash-led-class.c b/drivers/media/v4l2-core/v4l2-flash-led-class.c
index 34c489fed55e..cf7b3cb9a373 100644
--- a/drivers/media/v4l2-core/v4l2-flash-led-class.c
+++ b/drivers/media/v4l2-core/v4l2-flash-led-class.c
@@ -655,7 +655,7 @@ struct v4l2_flash *v4l2_flash_init(
if (ret < 0)
return ERR_PTR(ret);
- sd->entity.type = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;
+ sd->entity.function = MEDIA_ENT_T_V4L2_SUBDEV_FLASH;
ret = v4l2_flash_init_controls(v4l2_flash, config);
if (ret < 0)