git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-blackbird.c
diff --git
a/drivers/media/video/cx88/cx88-blackbird.c
b/drivers/media/video/cx88/cx88-blackbird.c
index
e100d8e
..
a502a4d
100644
(file)
--- a/
drivers/media/video/cx88/cx88-blackbird.c
+++ b/
drivers/media/video/cx88/cx88-blackbird.c
@@
-1341,7
+1341,7
@@
bb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
enum v4l2_field field)
{
struct cx8802_fh *fh = q->priv_data;
enum v4l2_field field)
{
struct cx8802_fh *fh = q->priv_data;
- return cx8802_buf_prepare(
q,
fh->dev, (struct cx88_buffer*)vb, field);
+ return cx8802_buf_prepare(fh->dev, (struct cx88_buffer*)vb, field);
}
static void
}
static void
@@
-1354,7
+1354,8
@@
bb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
static void
bb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
{
static void
bb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
{
- cx88_free_buffer(q, (struct cx88_buffer*)vb);
+ struct cx8802_fh *fh = q->priv_data;
+ cx88_free_buffer(fh->dev->pci, (struct cx88_buffer*)vb);
}
static struct videobuf_queue_ops blackbird_qops = {
}
static struct videobuf_queue_ops blackbird_qops = {