aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-10-30 08:45:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-22 09:17:02 -0500
commite070f1b47ee9f3591f93a205a3d8b0b06bb0afb5 (patch)
treee16bf3667dd47ba80e78ec229e38e63ef3842469 /drivers
parent864a121274c70fe9a1767db28bd86f5e5d0016a1 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/davinci/vpif_capture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index fcabc023885d..2d28a96e7775 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1715,7 +1715,7 @@ vpif_enum_dv_timings(struct file *file, void *priv,
1715 int ret; 1715 int ret;
1716 1716
1717 ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings); 1717 ret = v4l2_subdev_call(ch->sd, video, enum_dv_timings, timings);
1718 if (ret == -ENOIOCTLCMD && ret == -ENODEV) 1718 if (ret == -ENOIOCTLCMD || ret == -ENODEV)
1719 return -EINVAL; 1719 return -EINVAL;
1720 return ret; 1720 return ret;
1721} 1721}
@@ -1735,7 +1735,7 @@ vpif_query_dv_timings(struct file *file, void *priv,
1735 int ret; 1735 int ret;
1736 1736
1737 ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings); 1737 ret = v4l2_subdev_call(ch->sd, video, query_dv_timings, timings);
1738 if (ret == -ENOIOCTLCMD && ret == -ENODEV) 1738 if (ret == -ENOIOCTLCMD || ret == -ENODEV)
1739 return -ENODATA; 1739 return -ENODATA;
1740 return ret; 1740 return ret;
1741} 1741}