diff for duplicates of <20131216150612.GA15506@elgon.mountain>

diff --git a/a/1.txt b/N1/1.txt
index afc80a4..9c06259 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,12 +2,11 @@ The spin_lock_irqsave() macro is not nestable.  The second call will
 overwrite the first record of "flags" so the IRQs will not be enabled
 correctly at the end of the function.
 
-In the current code, this function is always called from the IRQ handler
-so everything works fine and this fix doesn't change anything.
+I haven't looked at all the callers but it could be that this function
+is always called with interrupts disabled and the bug doesn't cause
+problems in real life.
 
 Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
----
-v2:  Updated the change log
 
 diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
 index 766491e6a8d0..c9b71c750b15 100644
@@ -16,7 +15,7 @@ index 766491e6a8d0..c9b71c750b15 100644
 @@ -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;
@@ -25,7 +24,3 @@ index 766491e6a8d0..c9b71c750b15 100644
  	}
  
  	buf = list_first_entry(&video->dmaqueue, struct iss_buffer,
-_______________________________________________
-devel mailing list
-devel@linuxdriverproject.org
-http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
diff --git a/a/content_digest b/N1/content_digest
index 4d2d326..899a7ef 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
- "Subject\0[patch v2] [media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next()\0"
- "Date\0Wed, 18 Dec 2013 07:29:24 +0000\0"
+ "Subject\0[media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next()\0"
+ "Date\0Mon, 16 Dec 2013 18:06:12 +0300\0"
  "To\0Mauro Carvalho Chehab <m.chehab@samsung.com>\0"
  "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
   Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -15,12 +15,11 @@
  "overwrite the first record of \"flags\" so the IRQs will not be enabled\n"
  "correctly at the end of the function.\n"
  "\n"
- "In the current code, this function is always called from the IRQ handler\n"
- "so everything works fine and this fix doesn't change anything.\n"
+ "I haven't looked at all the callers but it could be that this function\n"
+ "is always called with interrupts disabled and the bug doesn't cause\n"
+ "problems in real life.\n"
  "\n"
  "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n"
- "---\n"
- "v2:  Updated the change log\n"
  "\n"
  "diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c\n"
  "index 766491e6a8d0..c9b71c750b15 100644\n"
@@ -29,7 +28,7 @@
  "@@ -451,9 +451,9 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)\n"
  " \t}\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"
@@ -37,10 +36,6 @@
  "+\t\tspin_unlock(&pipe->lock);\n"
  " \t}\n"
  " \n"
- " \tbuf = list_first_entry(&video->dmaqueue, struct iss_buffer,\n"
- "_______________________________________________\n"
- "devel mailing list\n"
- "devel@linuxdriverproject.org\n"
- http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
+ " \tbuf = list_first_entry(&video->dmaqueue, struct iss_buffer,"
 
-0bcb64f8103276139c81420293eab2a6af814d9afa21320607ba8e66917cc723
+43e485604ee8fdde9cbdaf32118a6072f88646fe0bae87dc68a48c330b014d77
