diff for duplicates of <1538732679.3545.5.camel@pengutronix.de>
diff --git a/a/1.txt b/N2/1.txt
index 252d8d6..0dd1c28 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -10,7 +10,7 @@ On Thu, 2018-10-04 at 11:53 -0700, Steve Longerbeam wrote:
> {
[...]
> + std = V4L2_STD_UNKNOWN;
-> + if (width == 720) {
+> + if (width = 720) {
> + switch (height) {
> + case 480:
> + std = V4L2_STD_NTSC;
@@ -23,7 +23,7 @@ On Thu, 2018-10-04 at 11:53 -0700, Steve Longerbeam wrote:
> + }
> + }
> +
-> + if (std == V4L2_STD_UNKNOWN) {
+> + if (std = V4L2_STD_UNKNOWN) {
> dev_err(csi->ipu->dev,
[...]
> + "Unsupported interlaced video mode\n");
@@ -36,13 +36,13 @@ On Thu, 2018-10-04 at 11:53 -0700, Steve Longerbeam wrote:
> + height = (std & V4L2_STD_525_60) ? 525 : 625;
I think this is a bit convoluted. Instead of initializing std, then
-possibly changing it, and then comparing to the inital value, and then
+possibly changing it, and then comparing to the inital value, and then
checking it again to determine the new height, why not just:
- if (width == 720 && height == 480) {
+ if (width = 720 && height = 480) {
std = V4L2_STD_NTSC;
height = 525;
- } else if (width == 720 && height == 576) {
+ } else if (width = 720 && height = 576) {
std = V4L2_STD_PAL;
height = 625;
} else {
@@ -114,8 +114,8 @@ parallel bus").
> ipu_csi_set_window(priv->csi, &crop);
>
> @@ -702,7 +693,7 @@ static int csi_setup(struct csi_priv *priv)
-> priv->crop.width == 2 * priv->compose.width,
-> priv->crop.height == 2 * priv->compose.height);
+> priv->crop.width = 2 * priv->compose.width,
+> priv->crop.height = 2 * priv->compose.height);
>
> - ipu_csi_init_interface(priv->csi, &mbus_cfg, &if_fmt);
> + ipu_csi_init_interface(priv->csi, &mbus_cfg, infmt, outfmt);
diff --git a/a/content_digest b/N2/content_digest
index 66db82c..5f503b7 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -11,7 +11,7 @@
"Subject\0Re: [PATCH v4 02/11] gpu: ipu-csi: Swap fields according to input/output field types\0"
]
[
- "Date\0Fri, 05 Oct 2018 11:44:39 +0200\0"
+ "Date\0Fri, 05 Oct 2018 09:44:39 +0000\0"
]
[
"To\0Steve Longerbeam <slongerbeam\@gmail.com>",
@@ -45,7 +45,7 @@
"> {\n",
"[...] \n",
"> +\t\tstd = V4L2_STD_UNKNOWN;\n",
- "> +\t\tif (width == 720) {\n",
+ "> +\t\tif (width = 720) {\n",
"> +\t\t\tswitch (height) {\n",
"> +\t\t\tcase 480:\n",
"> +\t\t\t\tstd = V4L2_STD_NTSC;\n",
@@ -58,7 +58,7 @@
"> +\t\t\t}\n",
"> +\t\t}\n",
"> +\n",
- "> +\t\tif (std == V4L2_STD_UNKNOWN) {\n",
+ "> +\t\tif (std = V4L2_STD_UNKNOWN) {\n",
"> \t\t\tdev_err(csi->ipu->dev,\n",
"[...]\n",
"> +\t\t\t\t\"Unsupported interlaced video mode\\n\");\n",
@@ -71,13 +71,13 @@
"> +\t\theight = (std & V4L2_STD_525_60) ? 525 : 625;\n",
"\n",
"I think this is a bit convoluted. Instead of initializing std, then\n",
- "possibly changing it, and then comparing to the inital value,\302\240and then\n",
+ "possibly changing it, and then comparing to the inital value,\303\202\302\240and then\n",
"checking it again to determine the new height, why not just:\n",
"\n",
- "\t\tif (width == 720 && height == 480) {\n",
+ "\t\tif (width = 720 && height = 480) {\n",
"\t\t\tstd = V4L2_STD_NTSC;\n",
"\t\t\theight = 525;\n",
- "\t\t} else if (width == 720 && height == 576) {\n",
+ "\t\t} else if (width = 720 && height = 576) {\n",
"\t\t\tstd = V4L2_STD_PAL;\n",
"\t\t\theight = 625;\n",
"\t\t} else {\n",
@@ -149,8 +149,8 @@
"> \tipu_csi_set_window(priv->csi, &crop);\n",
"> \n",
"> \@\@ -702,7 +693,7 \@\@ static int csi_setup(struct csi_priv *priv)\n",
- "> \t\t\t priv->crop.width == 2 * priv->compose.width,\n",
- "> \t\t\t priv->crop.height == 2 * priv->compose.height);\n",
+ "> \t\t\t priv->crop.width = 2 * priv->compose.width,\n",
+ "> \t\t\t priv->crop.height = 2 * priv->compose.height);\n",
"> \n",
"> -\tipu_csi_init_interface(priv->csi, &mbus_cfg, &if_fmt);\n",
"> +\tipu_csi_init_interface(priv->csi, &mbus_cfg, infmt, outfmt);\n",
@@ -159,4 +159,4 @@
"Philipp"
]
-f26b97b503a1a7369123eb60fd9d0585ed338f95b5a477beed3f3999b06c3943
+db737b903e98ef56afd6f91b91c2e59dc547ce50b73035c81a029954e9be0de4
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.