diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/media/common/saa7146_vbi.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/common/saa7146_vbi.c')
| -rw-r--r-- | drivers/media/common/saa7146_vbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 468d3c959075..500bd3f05e16 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
| @@ -410,7 +410,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) | |||
| 410 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? | 410 | V4L2_FIELD_SEQ_TB, // FIXME: does this really work? |
| 411 | sizeof(struct saa7146_buf), | 411 | sizeof(struct saa7146_buf), |
| 412 | file); | 412 | file); |
| 413 | init_MUTEX(&fh->vbi_q.lock); | 413 | mutex_init(&fh->vbi_q.lock); |
| 414 | 414 | ||
| 415 | init_timer(&fh->vbi_read_timeout); | 415 | init_timer(&fh->vbi_read_timeout); |
| 416 | fh->vbi_read_timeout.function = vbi_read_timeout; | 416 | fh->vbi_read_timeout.function = vbi_read_timeout; |