From a0dac2cdb3964e807e3ffb5df8dd1dd19fd8a91f Mon Sep 17 00:00:00 2001
From: Gerd Knorr <devnull@localhost>
Date: Fri, 28 May 2004 16:21:29 +0000
Subject: - userptr fix. - add KEY_TEXT define for 2.4.

---
 linux/drivers/media/video/video-buf.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/drivers/media')

diff --git a/linux/drivers/media/video/video-buf.c b/linux/drivers/media/video/video-buf.c
index 49b1d8d1c..b3d64a6aa 100644
--- a/linux/drivers/media/video/video-buf.c
+++ b/linux/drivers/media/video/video-buf.c
@@ -629,6 +629,8 @@ videobuf_qbuf(struct file *file, struct videobuf_queue *q,
 	case V4L2_MEMORY_USERPTR:
 		if (b->length < buf->bsize)
 			goto done;
+		if (STATE_NEEDS_INIT != buf->state && buf->baddr != b->m.userptr)
+			q->ops->buf_release(file,buf);
 		buf->baddr = b->m.userptr;
 		break;
 	case V4L2_MEMORY_OVERLAY:
-- 
cgit v1.2.3