diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-12 16:32:55 -0300 |
| commit | e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00 (patch) | |
| tree | da2f71ca3469aea362df4b9885b01bcc068bfc91 /libre/linux-libre-grsec/0012-fix-saa7134.patch | |
| parent | 6abc75d5f0c4d5c8302715a7da59cc02d22fbe36 (diff) | |
| parent | 8d0f4ac4cbf56fc5c5cadb5ba09c35e3674a886b (diff) | |
| download | abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.gz abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.tar.bz2 abslibre-e3acfdf0b0b71c3180b756bdc7ff4a8090bb5e00.zip | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
pcr/tomb/PKGBUILD
Diffstat (limited to 'libre/linux-libre-grsec/0012-fix-saa7134.patch')
| -rw-r--r-- | libre/linux-libre-grsec/0012-fix-saa7134.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/libre/linux-libre-grsec/0012-fix-saa7134.patch b/libre/linux-libre-grsec/0012-fix-saa7134.patch new file mode 100644 index 000000000..070fbc8eb --- /dev/null +++ b/libre/linux-libre-grsec/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); + |