redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] omap4iss: change the logic that checks if an entity is a subdev 

As we're getting rid of an specific number range for the V4L2 subdev,
we need to replace the check for MEDIA_ENT_T_V4L2_SUBDEV by a macro.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
hifive-unleashed-5.1
Mauro Carvalho Chehab 2015-05-07 22:12:37 -03:00
parent 14fae6fc53
commit bf4178a4c6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/media/omap4iss/iss_ipipe.c
View File

@ -447,8 +447,11 @@ static int ipipe_link_setup(struct media_entity *entity,
struct iss_ipipe_device *ipipe = v4l2_get_subdevdata(sd);
struct iss_device *iss = to_iss_device(ipipe);
switch (local->index | media_entity_type(remote->entity)) {
case IPIPE_PAD_SINK | MEDIA_ENT_T_V4L2_SUBDEV:
if (!is_media_entity_v4l2_subdev(remote->entity))
return -EINVAL;
switch (local->index) {
case IPIPE_PAD_SINK:
/* Read from IPIPEIF. */
if (!(flags & MEDIA_LNK_FL_ENABLED)) {
ipipe->input = IPIPE_INPUT_NONE;
@ -463,7 +466,7 @@ static int ipipe_link_setup(struct media_entity *entity,
break;
case IPIPE_PAD_SOURCE_VP | MEDIA_ENT_T_V4L2_SUBDEV:
case IPIPE_PAD_SOURCE_VP:
/* Send to RESIZER */
if (flags & MEDIA_LNK_FL_ENABLED) {
if (ipipe->output & ~IPIPE_OUTPUT_VP)