summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-05-28 16:21:29 +0000
committerGerd Knorr <devnull@localhost>2004-05-28 16:21:29 +0000
commita0dac2cdb3964e807e3ffb5df8dd1dd19fd8a91f (patch)
tree7f1efab2ab9d4a124ced3d55e6bf18bd04a9e875 /linux/drivers
parent7e61a4f39058b0fcb4b5f6a5454b968ed8a7925a (diff)
downloadmediapointer-dvb-s2-a0dac2cdb3964e807e3ffb5df8dd1dd19fd8a91f.tar.gz
mediapointer-dvb-s2-a0dac2cdb3964e807e3ffb5df8dd1dd19fd8a91f.tar.bz2
- userptr fix.
- add KEY_TEXT define for 2.4.
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/video-buf.c2
1 files changed, 2 insertions, 0 deletions
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: