diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:50:15 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-13 13:50:15 -0300 |
commit | dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395 (patch) | |
tree | 8e9f703aba9ff7c66ddf4fef5a740a6ef44c71a4 /linux/drivers/media/video/ivtv/ivtv-fileops.c | |
parent | b4bd63c6ce993e0bf2bf3aaecc3384740b495845 (diff) | |
parent | a73981e95b53d62cc7e42ce54e54473f3758d2e7 (diff) | |
download | mediapointer-dvb-s2-dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395.tar.gz mediapointer-dvb-s2-dbc0579cac0ed9f9af0bcf361a5c3fc56f4f8395.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-fileops.c')
-rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-fileops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-fileops.c b/linux/drivers/media/video/ivtv/ivtv-fileops.c index 2f38bb14a..1637097dd 100644 --- a/linux/drivers/media/video/ivtv/ivtv-fileops.c +++ b/linux/drivers/media/video/ivtv/ivtv-fileops.c @@ -766,6 +766,8 @@ int ivtv_v4l2_close(struct inode *inode, struct file *filp) IVTV_DEBUG_IOCTL("close() of %s\n", s->name); + v4l2_prio_close(&itv->prio, &id->prio); + /* Easy case first: this stream was never claimed by us */ if (s->id != id->open_id) { kfree(id); @@ -849,6 +851,7 @@ int ivtv_v4l2_open(struct inode *inode, struct file *filp) } item->itv = itv; item->type = y; + v4l2_prio_open(&itv->prio, &item->prio); item->open_id = itv->open_id++; filp->private_data = item; |