# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1192096703 -7200 # Node ID 4fbd75ec9acee9dc29de45491c6f3cee58b07076 # Parent 1f0b37d344c430ef09788f0193ada0ee08062447 v4l2_extension: fix ext device name
update card name, not driver name, since it is, what is seen in the device list
Signed-off-by: Jiri Slaby jirislaby@gmail.com
diff -r 1f0b37d344c4 -r 4fbd75ec9ace linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c Thu Oct 11 12:01:10 2007 +0200 +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-video.c Thu Oct 11 11:58:23 2007 +0200 @@ -151,7 +151,7 @@ static int vidioc_querycap(struct file * ret = base_dev->vidioc_querycap(&dev->fake_file, dev->fake_file.private_data, vc); - strlcpy(vc->driver, dev->vdev->name, sizeof(vc->driver)); + strlcpy(vc->card, dev->vdev->name, sizeof(vc->card)); } return ret; }
# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1192096885 -7200 # Node ID 2e25afbef75bbc71b14af66fe674f8bff66fa11f # Parent 4fbd75ec9acee9dc29de45491c6f3cee58b07076 v4l2_extension: fix poll
Don't return POLLIN when in fact no data is ready. add mask variable and OR it with POLL flags according to the state (we don't do it so far).
Signed-off-by: Jiri Slaby jirislaby@gmail.com
diff -r 4fbd75ec9ace -r 2e25afbef75b linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c Thu Oct 11 11:58:23 2007 +0200 +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c Thu Oct 11 12:01:25 2007 +0200 @@ -52,10 +52,11 @@ static unsigned int v4l2ext_hlp_poll(str static unsigned int v4l2ext_hlp_poll(struct file *file, poll_table *wait) { struct helperd *dev = file->private_data; + unsigned int mask = 0;
poll_wait(file, &dev->waitqueue, wait);
- return POLLIN | POLLRDNORM; + return mask; }
static int v4l2ext_hlp_open(struct inode *inode, struct file *file)
Jiri Slaby a écrit :
# HG changeset patch # User Jiri Slaby jirislaby@gmail.com # Date 1192096885 -7200 # Node ID 2e25afbef75bbc71b14af66fe674f8bff66fa11f # Parent 4fbd75ec9acee9dc29de45491c6f3cee58b07076 v4l2_extension: fix poll
Don't return POLLIN when in fact no data is ready. add mask variable and OR it with POLL flags according to the state (we don't do it so far).
Signed-off-by: Jiri Slaby jirislaby@gmail.com
diff -r 4fbd75ec9ace -r 2e25afbef75b linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c --- a/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c Thu Oct 11 11:58:23 2007 +0200 +++ b/linux/drivers/media/video/v4l2_extension/v4l2_extension-hlp.c Thu Oct 11 12:01:25 2007 +0200 @@ -52,10 +52,11 @@ static unsigned int v4l2ext_hlp_poll(str static unsigned int v4l2ext_hlp_poll(struct file *file, poll_table *wait) { struct helperd *dev = file->private_data;
unsigned int mask = 0;
poll_wait(file, &dev->waitqueue, wait);
- return POLLIN | POLLRDNORM;
- return mask;
}
static int v4l2ext_hlp_open(struct inode *inode, struct file *file)
Patch series comitted. Thanks Thierry
-
Jiri Slaby -
Thierry Merle