diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-07 22:12:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 12:18:51 -0200 |
| commit | 14fae6fc53b2b390bbba650d60b9555e9f7f4f26 (patch) | |
| tree | ca17293c2420d3520be203c97e84d7ef294fe769 /drivers/staging/media/davinci_vpfe/vpfe_video.c | |
| parent | 26614b9bf8b534406835ea66732c12e6fd7b50fd (diff) | |
| download | op-kernel-dev-14fae6fc53b2b390bbba650d60b9555e9f7f4f26.zip op-kernel-dev-14fae6fc53b2b390bbba650d60b9555e9f7f4f26.tar.gz | |
[media] davinci_vbpe: stop MEDIA_ENT_T_V4L2_SUBDEV abuse
This driver is abusing MEDIA_ENT_T_V4L2_SUBDEV:
- it uses a hack to check if the remote entity is a subdev;
- it still uses the legacy entity subtype check macro, that
will be removed soon.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/staging/media/davinci_vpfe/vpfe_video.c')
| -rw-r--r-- | drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c index 290f4b4..a5e3041 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c @@ -88,7 +88,7 @@ vpfe_video_remote_subdev(struct vpfe_video_device *video, u32 *pad) { struct media_pad *remote = media_entity_remote_pad(&video->pad); - if (remote == NULL || remote->entity->type != MEDIA_ENT_T_V4L2_SUBDEV) + if (!remote || !is_media_entity_v4l2_subdev(remote->entity)) return NULL; if (pad) *pad = remote->index; @@ -243,8 +243,7 @@ static int vpfe_video_validate_pipeline(struct vpfe_pipeline *pipe) /* Retrieve the source format */ pad = media_entity_remote_pad(pad); - if (pad == NULL || - pad->entity->type != MEDIA_ENT_T_V4L2_SUBDEV) + if (!pad || !is_media_entity_v4l2_subdev(pad->entity)) break; subdev = media_entity_to_v4l2_subdev(pad->entity); |
