diff options
author | 2014-05-09 11:59:48 +0200 | |
---|---|---|
committer | 2014-05-09 11:59:48 +0200 | |
commit | ad8e4849ab5b2250a71f2696ffce4c9cefe258a4 (patch) | |
tree | 20d8c9011ccedd1789937fcad2f6c5e6ad7ce9a9 /linux-drd/0012-fix-saa7134.patch | |
parent | 11a89d729d05b0c0d13c3546652609f68dd2b83a (diff) | |
download | pkgbuilds-ad8e4849ab5b2250a71f2696ffce4c9cefe258a4.tar.gz pkgbuilds-ad8e4849ab5b2250a71f2696ffce4c9cefe258a4.zip |
Update linux-drd to 3.14.2
Diffstat (limited to 'linux-drd/0012-fix-saa7134.patch')
-rw-r--r-- | linux-drd/0012-fix-saa7134.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/linux-drd/0012-fix-saa7134.patch b/linux-drd/0012-fix-saa7134.patch new file mode 100644 index 0000000..070fbc8 --- /dev/null +++ b/linux-drd/0012-fix-saa7134.patch @@ -0,0 +1,37 @@ +--- a/drivers/media/pci/saa7134/saa7134-video.c ++++ a/drivers/media/pci/saa7134/saa7134-video.c +@@ -1243,6 +1243,7 @@ static int video_release(struct file *file) + videobuf_streamoff(&dev->cap); + res_free(dev, fh, RESOURCE_VIDEO); + videobuf_mmap_free(&dev->cap); ++ INIT_LIST_HEAD(&dev->cap.stream); + } + if (dev->cap.read_buf) { + buffer_release(&dev->cap, dev->cap.read_buf); +@@ -1254,6 +1255,7 @@ static int video_release(struct file *file) + videobuf_stop(&dev->vbi); + res_free(dev, fh, RESOURCE_VBI); + videobuf_mmap_free(&dev->vbi); ++ INIT_LIST_HEAD(&dev->vbi.stream); + } + + /* ts-capture will not work in planar mode, so turn it off Hac: 04.05*/ +@@ -1987,17 +1989,12 @@ int saa7134_streamoff(struct file *file, void *priv, + enum v4l2_buf_type type) + { + struct saa7134_dev *dev = video_drvdata(file); +- int err; + int res = saa7134_resource(file); + + if (res != RESOURCE_EMPRESS) + pm_qos_remove_request(&dev->qos_request); + +- err = videobuf_streamoff(saa7134_queue(file)); +- if (err < 0) +- return err; +- res_free(dev, priv, res); +- return 0; ++ return videobuf_streamoff(saa7134_queue(file)); + } + EXPORT_SYMBOL_GPL(saa7134_streamoff); + |