diff for duplicates of <1468338700.8745.14.camel@perches.com> diff --git a/a/1.txt b/N1/1.txt index 7ffa271..8ae8423 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,16 +7,16 @@ On Tue, 2016-07-12 at 08:42 -0600, Shuah Khan wrote: > > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c > > [] > > > @@ -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 37f62a7..bf2e9b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,18 @@ "ref\01468276740-1591-1-git-send-email-shuahkh@osg.samsung.com\0" "ref\01468332418.8745.11.camel@perches.com\0" "ref\0578501E9.6090008@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 08:51:40 -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 08:42 -0600, Shuah Khan wrote:\n" @@ -16,16 +24,16 @@ "> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c\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" @@ -39,4 +47,4 @@ "Well, if you're resubmitting, I'd prefer it changed.\n" Thanks. -9680d78e19f043091a94dbb2b596a6afbaff211d061afab8ceaf02d9fa067a56 +889c968c521fa48c1f9106101746f7c6c8d20b40a484ba377c2fe7f8b5a1d5f6
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.