From 2c1e6f045d47491d597461cd22b510a0bd9b29f2 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Tue, 10 Jun 2008 15:18:16 -0300 Subject: [PATCH] --- yaml --- r: 98482 b: refs/heads/master c: 913f5fc209247b607b1994a710315966f4f9d358 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-empress.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8f5920ecf141..1cd456092d6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a14fe9605bfdfe360b97acc9ef912779eb860507 +refs/heads/master: 913f5fc209247b607b1994a710315966f4f9d358 diff --git a/trunk/drivers/media/video/saa7134/saa7134-empress.c b/trunk/drivers/media/video/saa7134/saa7134-empress.c index 94b2585bdf5b..1c8cd0ef4a65 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-empress.c +++ b/trunk/drivers/media/video/saa7134/saa7134-empress.c @@ -112,7 +112,6 @@ static int ts_release(struct inode *inode, struct file *file) videobuf_stop(&dev->empress_tsq); videobuf_mmap_free(&dev->empress_tsq); - dev->empress_users--; /* stop the encoder */ ts_reset_encoder(dev); @@ -121,6 +120,8 @@ static int ts_release(struct inode *inode, struct file *file) saa_writeb(SAA7134_AUDIO_MUTE_CTRL, saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); + dev->empress_users--; + return 0; }