diff options
| author | Markus Rechberger <devnull@localhost> | 2005-10-17 22:59:21 +0000 |
|---|---|---|
| committer | Markus Rechberger <devnull@localhost> | 2005-10-17 22:59:21 +0000 |
| commit | fabb792d38f0cfebc422fcb20279b01145d07777 (patch) | |
| tree | b0a725d32040be2204025900c16ee75e085979ca | |
| parent | e98f849158d586eeaf76ce06bda458694ff76668 (diff) | |
| download | mediapointer-dvb-s2-fabb792d38f0cfebc422fcb20279b01145d07777.tar.gz mediapointer-dvb-s2-fabb792d38f0cfebc422fcb20279b01145d07777.tar.bz2 | |
* ../linux/drivers/usb/media/em2820-video.c: (em2820_v4l2_close):
- cleanup dev assignment
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 14 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-video.c | 14 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 |
3 files changed, 11 insertions, 24 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 78d3dbfca..01fdd456e 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -417,20 +417,10 @@ static void em2820_release_resources(struct em2820 *dev) * em2820_v4l2_close() * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls */ -static int em2820_v4l2_close(struct inode *inode, struct file *file) +static int em2820_v4l2_close(struct inode *inode, struct file *filp) { int errCode; - int minor = iminor(inode); - struct em2820 *h,*dev = NULL; - struct list_head *list; - - list_for_each(list,&em2820_devlist) { - h = list_entry(list, struct em2820, devlist); - if (h->vdev->minor == minor) { - dev = h; - } - } - + struct em2820 *dev=filp->private_data; em2820_videodbg("users=%d", dev->users); diff --git a/linux/drivers/usb/media/em2820-video.c b/linux/drivers/usb/media/em2820-video.c index 78d3dbfca..01fdd456e 100644 --- a/linux/drivers/usb/media/em2820-video.c +++ b/linux/drivers/usb/media/em2820-video.c @@ -417,20 +417,10 @@ static void em2820_release_resources(struct em2820 *dev) * em2820_v4l2_close() * stops streaming and deallocates all resources allocated by the v4l2 calls and ioctls */ -static int em2820_v4l2_close(struct inode *inode, struct file *file) +static int em2820_v4l2_close(struct inode *inode, struct file *filp) { int errCode; - int minor = iminor(inode); - struct em2820 *h,*dev = NULL; - struct list_head *list; - - list_for_each(list,&em2820_devlist) { - h = list_entry(list, struct em2820, devlist); - if (h->vdev->minor == minor) { - dev = h; - } - } - + struct em2820 *dev=filp->private_data; em2820_videodbg("users=%d", dev->users); diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 238bc1ff4..4f43a1b00 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-18 00:45 mrechberger + + * ../linux/drivers/usb/media/em2820-video.c: (em2820_v4l2_close): + - cleanup dev assignment + + Signed-off-by: Markus Rechberger <mrechberger@gmail.com> + 2005-10-18 00:37 mrechberger * ../linux/drivers/usb/media/em2820-video.c: |