diff for duplicates of <9772816.NZs94s1p3P@avalon> diff --git a/a/1.txt b/N1/1.txt index fe63913..fd76ef2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ and applied to my tree. I'll send a pull request shortly. > @@ -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 3951ab3..7d14012 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: [patch v2] [media] v4l: omap4iss: Restore irq flags correctly in omap4iss_video_buffer_next()\0" - "Date\0Thu, 19 Dec 2013 01:03:05 +0000\0" + "Date\0Thu, 19 Dec 2013 02:03:05 +0100\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Mauro Carvalho Chehab <m.chehab@samsung.com>" devel@driverdev.osuosl.org @@ -41,7 +41,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" @@ -56,4 +56,4 @@ "\n" Laurent Pinchart -2276ab4d515981ca3f1499e243f5deb71e572ccde9e566c2c6b07641fc47651f +cdaa6e94d85b666be64e8cda206ca4db10892b7e7123979198ebc5e3b3c222b3
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.