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
nexedi
linux
Commits
4c6bc102
Commit
4c6bc102
authored
21 years ago
by
Gerd Knorr
Committed by
Linus Torvalds
21 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] v4l: saa7146 driver update
This adapts the saa7146 driver to the videobuf changes
parent
b405268b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
drivers/media/common/saa7146_vbi.c
drivers/media/common/saa7146_vbi.c
+1
-1
drivers/media/common/saa7146_video.c
drivers/media/common/saa7146_video.c
+3
-2
No files found.
drivers/media/common/saa7146_vbi.c
View file @
4c6bc102
...
...
@@ -235,7 +235,7 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l
saa7146_pgtable_free
(
dev
->
pci
,
&
buf
->
pt
[
2
]);
saa7146_pgtable_alloc
(
dev
->
pci
,
&
buf
->
pt
[
2
]);
err
=
videobuf_iolock
(
dev
->
pci
,
&
buf
->
vb
);
err
=
videobuf_iolock
(
dev
->
pci
,
&
buf
->
vb
,
NULL
);
if
(
err
)
goto
oops
;
saa7146_pgtable_build_single
(
dev
->
pci
,
&
buf
->
pt
[
2
],
buf
->
vb
.
dma
.
sglist
,
buf
->
vb
.
dma
.
sglen
);
...
...
This diff is collapsed.
Click to expand it.
drivers/media/common/saa7146_video.c
View file @
4c6bc102
...
...
@@ -1090,7 +1090,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
q
=
&
fh
->
video_q
;
down
(
&
q
->
lock
);
err
=
videobuf_mmap_setup
(
file
,
q
,
gbuffers
,
gbufsize
);
// ,V4L2_MEMORY_MMAP);
err
=
videobuf_mmap_setup
(
file
,
q
,
gbuffers
,
gbufsize
,
V4L2_MEMORY_MMAP
);
if
(
err
<
0
)
{
up
(
&
q
->
lock
);
return
err
;
...
...
@@ -1185,7 +1186,7 @@ static int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4
saa7146_pgtable_alloc
(
dev
->
pci
,
&
buf
->
pt
[
0
]);
}
err
=
videobuf_iolock
(
dev
->
pci
,
&
buf
->
vb
);
err
=
videobuf_iolock
(
dev
->
pci
,
&
buf
->
vb
,
NULL
);
if
(
err
)
goto
oops
;
err
=
saa7146_pgtable_build
(
dev
,
buf
);
...
...
This diff is collapsed.
Click to expand it.
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