diff options
| -rw-r--r-- | linux/drivers/media/video/video-buf.c | 2 | ||||
| -rw-r--r-- | linux/include/media/ir-common.h | 1 |
2 files changed, 3 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: diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 9095bb923..4c0e15ad0 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -37,6 +37,7 @@ # define KEY_TV 0x179 # define KEY_CD 0x17f # define KEY_TUNER 0x182 +# define KEY_TEXT 0x184 # define KEY_DVD 0x185 # define KEY_AUDIO 0x188 # define KEY_VIDEO 0x189 |