Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
4e995d5a
Commit
4e995d5a
authored
Apr 08, 2002
by
Gerd Knorr
Committed by
Linus Torvalds
Apr 08, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adapt meye v4l driver to 2.5.8-pre1 videodev fixes.
parent
8ce6edde
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
drivers/media/video/meye.c
drivers/media/video/meye.c
+9
-4
No files found.
drivers/media/video/meye.c
View file @
4e995d5a
...
...
@@ -893,8 +893,8 @@ static int meye_release(struct inode *inode, struct file *file) {
return
0
;
}
static
int
meye_ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
void
*
arg
)
{
static
int
meye_
do_
ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
void
*
arg
)
{
switch
(
cmd
)
{
...
...
@@ -1169,6 +1169,12 @@ static int meye_ioctl(struct inode *inode, struct file *file,
return
0
;
}
static
int
meye_ioctl
(
struct
inode
*
inode
,
struct
file
*
file
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
return
video_usercopy
(
inode
,
file
,
cmd
,
arg
,
meye_do_ioctl
);
}
static
int
meye_mmap
(
struct
file
*
file
,
struct
vm_area_struct
*
vma
)
{
unsigned
long
start
=
vma
->
vm_start
;
unsigned
long
size
=
vma
->
vm_end
-
vma
->
vm_start
;
...
...
@@ -1209,7 +1215,7 @@ static struct file_operations meye_fops = {
open:
meye_open
,
release:
meye_release
,
mmap:
meye_mmap
,
ioctl:
video_generic
_ioctl
,
ioctl:
meye
_ioctl
,
llseek:
no_llseek
,
};
...
...
@@ -1219,7 +1225,6 @@ static struct video_device meye_template = {
type:
VID_TYPE_CAPTURE
,
hardware:
VID_HARDWARE_MEYE
,
fops:
&
meye_fops
,
kernel_ioctl:
meye_ioctl
,
};
static
int
__devinit
meye_probe
(
struct
pci_dev
*
pcidev
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment