git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
drivers
/
media
/
common
/
saa7146_vbi.c
diff --git
a/drivers/media/common/saa7146_vbi.c
b/drivers/media/common/saa7146_vbi.c
index
bfbd5a8
..
2d4533a
100644
(file)
--- a/
drivers/media/common/saa7146_vbi.c
+++ b/
drivers/media/common/saa7146_vbi.c
@@
-375,7
+375,7
@@
static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
static int vbi_open(struct saa7146_dev *dev, struct file *file)
{
static int vbi_open(struct saa7146_dev *dev, struct file *file)
{
- struct saa7146_fh *fh =
(struct saa7146_fh *)
file->private_data;
+ struct saa7146_fh *fh = file->private_data;
u32 arbtr_ctrl = saa7146_read(dev, PCI_BT_V1);
int ret = 0;
u32 arbtr_ctrl = saa7146_read(dev, PCI_BT_V1);
int ret = 0;
@@
-407,12
+407,12
@@
static int vbi_open(struct saa7146_dev *dev, struct file *file)
fh->vbi_fmt.start[1] = 312;
fh->vbi_fmt.count[1] = 16;
fh->vbi_fmt.start[1] = 312;
fh->vbi_fmt.count[1] = 16;
- videobuf_queue_
pci
_init(&fh->vbi_q, &vbi_qops,
-
dev->pci
, &dev->slock,
+ videobuf_queue_
sg
_init(&fh->vbi_q, &vbi_qops,
+
&dev->pci->dev
, &dev->slock,
V4L2_BUF_TYPE_VBI_CAPTURE,
V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
sizeof(struct saa7146_buf),
V4L2_BUF_TYPE_VBI_CAPTURE,
V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
sizeof(struct saa7146_buf),
- file);
+ file
, NULL
);
init_timer(&fh->vbi_read_timeout);
fh->vbi_read_timeout.function = vbi_read_timeout;
init_timer(&fh->vbi_read_timeout);
fh->vbi_read_timeout.function = vbi_read_timeout;
@@
-437,7
+437,7
@@
static int vbi_open(struct saa7146_dev *dev, struct file *file)
static void vbi_close(struct saa7146_dev *dev, struct file *file)
{
static void vbi_close(struct saa7146_dev *dev, struct file *file)
{
- struct saa7146_fh *fh =
(struct saa7146_fh *)
file->private_data;
+ struct saa7146_fh *fh = file->private_data;
struct saa7146_vv *vv = dev->vv_data;
DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
struct saa7146_vv *vv = dev->vv_data;
DEB_VBI(("dev:%p, fh:%p\n",dev,fh));