diff for duplicates of <1389202.kRDKAQ31OA@avalon> diff --git a/a/1.txt b/N1/1.txt index b69dd17..6806f17 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ rephrase the commit message accordingly ? > @@ -451,9 +451,9 @@ struct iss_buffer *omap4iss_video_buffer_next(struct > iss_video *video) } > -> if (video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->input != NULL) { +> if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->input != NULL) { > - spin_lock_irqsave(&pipe->lock, flags); > + spin_lock(&pipe->lock); > pipe->state &= ~ISS_PIPELINE_STREAM; diff --git a/a/content_digest b/N1/content_digest index 7c32a8e..1000f1b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020131216150612.GA15506@elgon.mountain\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next()\0" - "Date\0Tue, 17 Dec 2013 17:28:13 +0000\0" + "Date\0Tue, 17 Dec 2013 18:28:13 +0100\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Mauro Carvalho Chehab <m.chehab@samsung.com>" Greg Kroah-Hartman <gregkh@linuxfoundation.org> @@ -38,7 +38,7 @@ "> @@ -451,9 +451,9 @@ struct iss_buffer *omap4iss_video_buffer_next(struct\n" "> iss_video *video) }\n" "> \n" - "> \tif (video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->input != NULL) {\n" + "> \tif (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->input != NULL) {\n" "> -\t\tspin_lock_irqsave(&pipe->lock, flags);\n" "> +\t\tspin_lock(&pipe->lock);\n" "> \t\tpipe->state &= ~ISS_PIPELINE_STREAM;\n" @@ -52,4 +52,4 @@ "\n" Laurent Pinchart -c83d3efacca5ec5d661c2bdfd9b23a322f9c9921d04e558e72202bb3f7c093ab +e25edb3b489e6cb50d083a809a41edbd8227e893471a71326321173476ef4940
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.