From d7ed0bfe70530acfe983fe33aa03f979abbb0921 Mon Sep 17 00:00:00 2001
From: Brandon Philips <bphilips@suse.de>
Date: Sun, 13 Apr 2008 14:57:01 -0300
Subject: [PATCH] --- yaml --- r: 92637 b: refs/heads/master c:
 0561297501842b5d7e0ca8805084f4d3f97c1078 h: refs/heads/master i:   92635:
 0bb1df7f20c605ffd6c0f64d856082b36b6e5860 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/em28xx/em28xx-video.c | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 0aa8589e84eb..ec13fb6fde93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78bb3949a965e8a28e20988e28868429606b3639
+refs/heads/master: 0561297501842b5d7e0ca8805084f4d3f97c1078
diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c
index 0a2ff4afe416..0aaf4e767e0d 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-video.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-video.c
@@ -630,16 +630,10 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
 	if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
 		return -EINVAL;
 
-	if (buf->fmt       != fh->fmt    ||
-	    buf->vb.width  != dev->width  ||
-	    buf->vb.height != dev->height ||
-	    buf->vb.field  != field) {
-		buf->fmt       = fh->fmt;
-		buf->vb.width  = dev->width;
-		buf->vb.height = dev->height;
-		buf->vb.field  = field;
-		buf->vb.state = VIDEOBUF_NEEDS_INIT;
-	}
+	buf->fmt       = fh->fmt;
+	buf->vb.width  = dev->width;
+	buf->vb.height = dev->height;
+	buf->vb.field  = field;
 
 	if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
 		rc = videobuf_iolock(vq, &buf->vb, NULL);
@@ -974,6 +968,12 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
 
 	mutex_lock(&dev->lock);
 
+	if (videobuf_queue_is_busy(&fh->vb_vidq)) {
+		em28xx_errdev("%s queue busy\n", __func__);
+		rc = -EBUSY;
+		goto out;
+	}
+
 	/* set new image size */
 	dev->width = f->fmt.pix.width;
 	dev->height = f->fmt.pix.height;
@@ -985,8 +985,11 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv,
 	em28xx_set_alternate(dev);
 	em28xx_resolution_set(dev);
 
+	rc = 0;
+
+out:
 	mutex_unlock(&dev->lock);
-	return 0;
+	return rc;
 }
 
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm)