diff options
| author | Gerd Knorr <devnull@localhost> | 2004-10-20 17:44:23 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-10-20 17:44:23 +0000 |
| commit | b6e0bc4cf1eebed71e6bd7f67bf1e3e7fc8764c6 (patch) | |
| tree | 2b92afaa3a49e0128448dd73bbc3099febb15b26 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 0ccd772fd27e5b6ddb7a5cabe182b5c4128d3dc3 (diff) | |
| download | mediapointer-dvb-s2-b6e0bc4cf1eebed71e6bd7f67bf1e3e7fc8764c6.tar.gz mediapointer-dvb-s2-b6e0bc4cf1eebed71e6bd7f67bf1e3e7fc8764c6.tar.bz2 | |
- switch over to "frontend refactored" cvs branch.
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index e301bec5e..683ef885c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-empress.c,v 1.1 2004/10/19 16:02:05 kraxel Exp $ + * $Id: saa7134-empress.c,v 1.2 2004/10/20 17:44:24 kraxel Exp $ * * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs] * @@ -90,9 +90,9 @@ static int ts_open(struct inode *inode, struct file *file) if (dev->empress_users) goto done; - dev->empress_started = 0; dev->empress_users++; file->private_data = dev; + ts_init_encoder(dev, NULL); err = 0; done: @@ -112,8 +112,7 @@ static int ts_release(struct inode *inode, struct file *file) dev->empress_users--; /* stop the encoder */ - if (dev->empress_started) - ts_reset_encoder(dev); + ts_reset_encoder(dev); up(&dev->empress_tsq.lock); return 0; @@ -124,11 +123,6 @@ ts_read(struct file *file, char __user *data, size_t count, loff_t *ppos) { struct saa7134_dev *dev = file->private_data; - if (!dev->empress_started) { - ts_init_encoder(dev, NULL); - dev->empress_started = 1; - } - return videobuf_read_stream(file->private_data, &dev->empress_tsq, data, count, ppos, 0, file->f_flags & O_NONBLOCK); |