UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] davinci: vpif_capture: fix return type check for v4l2_subdev_call() 

The v4l2_subdev_call() call returns -ENODEV when subdev is
null and -ENOIOCTLCMD wnen no icotl is present.
This patch fixes the return type check for v4l2_subdev_call().
The pattern E == C1 && E == C2 is always false. This patch
fix this according to the assumption that && should be ||.
dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
[prabhakar.lad@ti.com: reword commit message]
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Wei Yongjun 2012-10-30 09:45:00 -03:00 committed by Mauro Carvalho Chehab
parent 864a121274
commit e070f1b47e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/davinci/vpif_capture.c
View File

@ -1715,7 +1715,7 @@ vpif_enum_dv_timings(struct file *file, void *priv,
int ret; int ret;
ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings); ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
if (ret == -ENOIOCTLCMD && ret == -ENODEV) if (ret == -ENOIOCTLCMD || ret == -ENODEV)
return -EINVAL; return -EINVAL;
return ret; return ret;
} }
@ -1735,7 +1735,7 @@ vpif_query_dv_timings(struct file *file, void *priv,
int ret; int ret;
ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings); ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings);
if (ret == -ENOIOCTLCMD && ret == -ENODEV) if (ret == -ENOIOCTLCMD || ret == -ENODEV)
return -ENODATA; return -ENODATA;
return ret; return ret;
} }