diff --git a/[refs] b/[refs] index e56b77e59cea..7a03bd24898b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe00b0ed10833a3faf18319be10620ed565bd24 +refs/heads/master: 0b5f56d67821587495eb47014750e2ae7373d635 diff --git a/trunk/drivers/media/video/cx88/cx88-blackbird.c b/trunk/drivers/media/video/cx88/cx88-blackbird.c index be367c5c5293..10556d3d0838 100644 --- a/trunk/drivers/media/video/cx88/cx88-blackbird.c +++ b/trunk/drivers/media/video/cx88/cx88-blackbird.c @@ -1569,6 +1569,7 @@ static int mpeg_release(struct inode *inode, struct file *file) BLACKBIRD_RAW_BITS_NONE ); + cx8802_cancel_buffers(fh->dev); /* stop mpeg capture */ if (fh->mpegq.streaming) videobuf_streamoff(&fh->mpegq);