diff for duplicates of <1468340137.8745.20.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 6e57741..a310ca2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,16 +12,16 @@ On Tue, 2016-07-12 at 10:08 -0600, Shuah Khan wrote: > > > > [] > > > > > > > > > > @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv, -> > > > > ? u32 left, right, top, bottom; -> > > > > ? -> > > > > ? if (ctx->state != MFCINST_HEAD_PARSED && +> > > > > u32 left, right, top, bottom; +> > > > > +> > > > > if (ctx->state != MFCINST_HEAD_PARSED && > > > > > - ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING > > > > > - && ctx->state != MFCINST_FINISHED) { > > > > > - mfc_err("Cannont set crop\n"); > > > > > - return -EINVAL; > > > > > - } -> > > > > + ????ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING -> > > > > + ????&& ctx->state != MFCINST_FINISHED) { +> > > > > + ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING +> > > > > + && ctx->state != MFCINST_FINISHED) { > > > > > + mfc_err("Can not get crop information\n"); > > > > > + return -EINVAL; > > > > > + } diff --git a/a/content_digest b/N1/content_digest index 4223f71..19087f2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,10 +3,18 @@ "ref\0578501E9.6090008@osg.samsung.com\0" "ref\01468338700.8745.14.camel@perches.com\0" "ref\057851607.9050005@osg.samsung.com\0" - "From\0joe@perches.com (Joe Perches)\0" - "Subject\0[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors\0" + "From\0Joe Perches <joe@perches.com>\0" + "Subject\0Re: [PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors\0" "Date\0Tue, 12 Jul 2016 09:15:37 -0700\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Shuah Khan <shuahkh@osg.samsung.com>" + kyungmin.park@samsung.com + k.debski@samsung.com + jtp.park@samsung.com + mchehab@kernel.org + " javier@osg.samsung.com\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-media@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, 2016-07-12 at 10:08 -0600, Shuah Khan wrote:\n" @@ -23,16 +31,16 @@ "> > > > []\n" "> > > > > \n" "> > > > > @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,\n" - "> > > > > ?\tu32 left, right, top, bottom;\n" - "> > > > > ?\n" - "> > > > > ?\tif (ctx->state != MFCINST_HEAD_PARSED &&\n" + "> > > > > \302\240\tu32 left, right, top, bottom;\n" + "> > > > > \302\240\n" + "> > > > > \302\240\tif (ctx->state != MFCINST_HEAD_PARSED &&\n" "> > > > > -\tctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING\n" "> > > > > -\t\t\t\t\t&& ctx->state != MFCINST_FINISHED) {\n" "> > > > > -\t\t\tmfc_err(\"Cannont set crop\\n\");\n" "> > > > > -\t\t\treturn -EINVAL;\n" "> > > > > -\t\t}\n" - "> > > > > +\t????ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING\n" - "> > > > > +\t????&& ctx->state != MFCINST_FINISHED) {\n" + "> > > > > +\t\302\240\302\240\302\240\302\240ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING\n" + "> > > > > +\t\302\240\302\240\302\240\302\240&& ctx->state != MFCINST_FINISHED) {\n" "> > > > > +\t\tmfc_err(\"Can not get crop information\\n\");\n" "> > > > > +\t\treturn -EINVAL;\n" "> > > > > +\t}\n" @@ -64,4 +72,4 @@ "This could both enable dynamic_debug uses for the KERN_DEBUG\n" cases and reduce overall object size. -b26fd35c0784a290d4f0529299d802a142566e8d69b101fb79924272a880a747 +352b406c2d4f7501ef1890c93f1190bd65f9dea031926384a0d34d4249f116ab
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.