Commit 08966bde authored by schrieveslaach's avatar schrieveslaach

Workaround pm_usage_cnt

parent 8e31ef03
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/common/saa7146_vbi.c linux-tbs-drivers/linux/drivers/media/common/saa7146_vbi.c
--- linux-tbs-drivers-bak/linux/drivers/media/common/saa7146_vbi.c 2021-01-09 20:06:41.046293491 +0100
+++ linux-tbs-drivers/linux/drivers/media/common/saa7146_vbi.c 2021-01-09 20:07:36.516507390 +0100
+++ linux-tbs-drivers/linux/drivers/media/common/saa7146_vbi.c 2021-01-09 20:29:01.939474584 +0100
@@ -1,3 +1,4 @@
+#include <linux/sched/signal.h>
#include <media/saa7146_vv.h>
......@@ -8,7 +8,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/common/saa7146_vbi.c linux-t
static int vbi_pixel_to_capture = 720 * 2;
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/common/saa716x/saa716x_pci.c linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_pci.c
--- linux-tbs-drivers-bak/linux/drivers/media/common/saa716x/saa716x_pci.c 2021-01-09 20:06:41.059626881 +0100
+++ linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_pci.c 2021-01-09 20:09:54.406890525 +0100
+++ linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_pci.c 2021-01-09 20:29:01.939474584 +0100
@@ -46,7 +46,7 @@
for (i = 0; i < SAA716x_MSI_MAX_VECTORS; i++)
saa716x->msix_entries[i].entry = i;
......@@ -20,7 +20,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/common/saa716x/saa716x_pci.c
if (ret > 0)
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2021-01-09 20:06:41.062960228 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2021-01-09 20:10:37.603639865 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2021-01-09 20:29:01.939474584 +0100
@@ -37,6 +37,7 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
......@@ -31,7 +31,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.
#include "dvb_ringbuffer.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_demux.c linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_demux.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_demux.c 2021-01-09 20:06:41.062960228 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_demux.c 2021-01-09 20:11:08.853690024 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_demux.c 2021-01-09 20:29:01.942807911 +0100
@@ -29,6 +29,7 @@
#include <linux/poll.h>
#include <linux/string.h>
......@@ -42,7 +42,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_demux.c lin
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_frontend.c linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_frontend.c 2021-01-09 20:06:41.062960228 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_frontend.c 2021-01-09 20:11:22.143709036 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_frontend.c 2021-01-09 20:29:01.942807911 +0100
@@ -37,6 +37,7 @@
#include <linux/freezer.h>
#include <linux/jiffies.h>
......@@ -53,7 +53,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
#include "dvb_frontend.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c 2021-01-09 20:06:41.066293575 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c 2021-01-09 20:11:39.200398156 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.c 2021-01-09 20:29:01.942807911 +0100
@@ -31,6 +31,8 @@
#include <linux/module.h>
#include <linux/sched.h>
......@@ -65,7 +65,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/dvb-core/dvb_ringbuffer.
#include "dvb_ringbuffer.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/ngene/ngene-cards.c linux-tbs-drivers/linux/drivers/media/dvb/ngene/ngene-cards.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/ngene/ngene-cards.c 2021-01-09 20:06:41.076293617 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/ngene/ngene-cards.c 2021-01-09 20:13:38.930499803 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/ngene/ngene-cards.c 2021-01-09 20:29:01.942807911 +0100
@@ -509,12 +509,6 @@
return PCI_ERS_RESULT_CAN_RECOVER;
}
......@@ -89,7 +89,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/ngene/ngene-cards.c linu
};
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/pt1/pt1.c linux-tbs-drivers/linux/drivers/media/dvb/pt1/pt1.c
--- linux-tbs-drivers-bak/linux/drivers/media/dvb/pt1/pt1.c 2021-01-09 20:06:41.076293617 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/pt1/pt1.c 2021-01-09 20:14:36.943851329 +0100
+++ linux-tbs-drivers/linux/drivers/media/dvb/pt1/pt1.c 2021-01-09 20:29:01.942807911 +0100
@@ -28,6 +28,7 @@
#include <linux/pci.h>
#include <linux/kthread.h>
......@@ -100,7 +100,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/dvb/pt1/pt1.c linux-tbs-driv
#include "dvb_demux.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/rc/lirc_dev.c linux-tbs-drivers/linux/drivers/media/rc/lirc_dev.c
--- linux-tbs-drivers-bak/linux/drivers/media/rc/lirc_dev.c 2021-01-09 20:06:41.049626839 +0100
+++ linux-tbs-drivers/linux/drivers/media/rc/lirc_dev.c 2021-01-09 20:15:06.903853800 +0100
+++ linux-tbs-drivers/linux/drivers/media/rc/lirc_dev.c 2021-01-09 20:29:01.942807911 +0100
@@ -34,6 +34,7 @@
#include <linux/bitops.h>
#include <linux/device.h>
......@@ -111,7 +111,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/rc/lirc_dev.c linux-tbs-driv
#include <media/lirc_dev.h>
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/arv.c linux-tbs-drivers/linux/drivers/media/video/arv.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/arv.c 2021-01-09 20:06:41.049626839 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/arv.c 2021-01-09 20:15:36.383851971 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/arv.c 2021-01-09 20:29:01.942807911 +0100
@@ -32,6 +32,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
......@@ -122,7 +122,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/arv.c linux-tbs-driver
#include <asm/m32r.h>
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_core.c linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_core.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_core.c 2021-01-09 20:06:41.079626964 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_core.c 2021-01-09 20:16:06.477179328 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_core.c 2021-01-09 20:29:01.942807911 +0100
@@ -35,6 +35,7 @@
#include <linux/mm.h>
#include <linux/vmalloc.h>
......@@ -133,7 +133,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_core.c lin
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_v4l.c linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_v4l.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_v4l.c 2021-01-09 20:06:41.079626964 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_v4l.c 2021-01-09 20:16:37.890502245 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cpia2/cpia2_v4l.c 2021-01-09 20:29:01.942807911 +0100
@@ -38,6 +38,7 @@
#include <linux/init.h>
#include <linux/videodev2.h>
......@@ -144,7 +144,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cpia2/cpia2_v4l.c linu
#include "cpia2.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cx18/cx18-driver.c linux-tbs-drivers/linux/drivers/media/video/cx18/cx18-driver.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/cx18/cx18-driver.c 2021-01-09 20:06:41.079626964 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cx18/cx18-driver.c 2021-01-09 20:17:15.420484553 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cx18/cx18-driver.c 2021-01-09 20:29:01.942807911 +0100
@@ -22,6 +22,8 @@
* 02111-1307 USA
*/
......@@ -156,7 +156,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cx18/cx18-driver.c lin
#include "cx18-version.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/gspca/cpia1.c linux-tbs-drivers/linux/drivers/media/video/gspca/cpia1.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/gspca/cpia1.c 2021-01-09 20:06:41.082960312 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/gspca/cpia1.c 2021-01-09 20:17:39.960470083 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/gspca/cpia1.c 2021-01-09 20:29:01.942807911 +0100
@@ -29,6 +29,7 @@
#define MODULE_NAME "cpia1"
......@@ -167,7 +167,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/gspca/cpia1.c linux-tb
MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-driver.c linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-driver.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-driver.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-driver.c 2021-01-09 20:18:13.913779837 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-driver.c 2021-01-09 20:29:01.942807911 +0100
@@ -59,6 +59,8 @@
#include <media/tveeprom.h>
#include <media/saa7115.h>
......@@ -179,7 +179,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-driver.c lin
/* If you have already X v4l cards, then set this to X. This way
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-fileops.c linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-fileops.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-fileops.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-fileops.c 2021-01-09 20:19:07.903734441 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-fileops.c 2021-01-09 20:29:01.946141237 +0100
@@ -35,6 +35,7 @@
#include "ivtv-firmware.h"
#include <media/v4l2-event.h>
......@@ -190,7 +190,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-fileops.c li
If no one else is using this stream then the stream is claimed and
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-ioctl.c linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-ioctl.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-ioctl.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-ioctl.c 2021-01-09 20:19:32.040377892 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-ioctl.c 2021-01-09 20:29:01.946141237 +0100
@@ -37,6 +37,7 @@
#include <media/v4l2-chip-ident.h>
#include <media/v4l2-event.h>
......@@ -201,7 +201,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-ioctl.c linu
{
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-yuv.c linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-yuv.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-yuv.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-yuv.c 2021-01-09 20:19:50.320359185 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtv-yuv.c 2021-01-09 20:29:01.946141237 +0100
@@ -18,6 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
......@@ -212,7 +212,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtv-yuv.c linux-
#include "ivtv-yuv.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtvfb.c linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtvfb.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtvfb.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtvfb.c 2021-01-09 20:18:46.747086672 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/ivtv/ivtvfb.c 2021-01-09 20:29:01.946141237 +0100
@@ -43,6 +43,7 @@
#include <linux/fb.h>
#include <linux/ivtvfb.h>
......@@ -223,7 +223,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/ivtv/ivtvfb.c linux-tb
#include <asm/mtrr.h>
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c linux-tbs-drivers/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c 2021-01-09 20:06:41.086293659 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c 2021-01-09 20:20:36.820307461 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/pvrusb2/pvrusb2-ioread.c 2021-01-09 20:29:01.946141237 +0100
@@ -25,6 +25,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
......@@ -232,9 +232,21 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/pvrusb2/pvrusb2-ioread
#include <asm/uaccess.h>
#define BUFFER_COUNT 32
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/tlg2300/pd-common.h linux-tbs-drivers/linux/drivers/media/video/tlg2300/pd-common.h
--- linux-tbs-drivers-bak/linux/drivers/media/video/tlg2300/pd-common.h 2021-01-09 20:06:41.089627006 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/tlg2300/pd-common.h 2021-01-09 20:55:30.965081818 +0100
@@ -258,7 +258,7 @@
#else
#define in_hibernation(pd) (0)
#endif
-#define get_pm_count(p) (atomic_read(&(p)->interface->pm_usage_cnt))
+#define get_pm_count(p) (0))
#define log(a, ...) printk(KERN_DEBUG "\t[ %s : %.3d ] "a"\n", \
__func__, __LINE__, ## __VA_ARGS__)
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/videobuf-dma-sg.c linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/videobuf-dma-sg.c 2021-01-09 20:06:41.056293533 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c 2021-01-09 20:23:03.670110113 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/videobuf-dma-sg.c 2021-01-09 20:29:01.946141237 +0100
@@ -408,28 +408,20 @@
* now ...). Bounce buffers don't work very well for the data rates
* video capture has.
......@@ -275,7 +287,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/videobuf-dma-sg.c linu
}
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_device.c linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_device.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_device.c 2021-01-09 20:06:41.089627006 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_device.c 2021-01-09 20:23:39.583388412 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_device.c 2021-01-09 20:29:01.946141237 +0100
@@ -44,6 +44,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
......@@ -286,7 +298,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_device.c l
#include <asm/io.h>
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_driver.c linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_driver.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_driver.c 2021-01-09 20:06:41.089627006 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_driver.c 2021-01-09 20:24:17.909993810 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_driver.c 2021-01-09 20:29:01.946141237 +0100
@@ -69,6 +69,7 @@
#include <linux/proc_fs.h>
......@@ -297,7 +309,7 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/zoran/zoran_driver.c l
#include "zoran_card.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/staging/go7007/go7007-v4l2.c linux-tbs-drivers/linux/drivers/staging/go7007/go7007-v4l2.c
--- linux-tbs-drivers-bak/linux/drivers/staging/go7007/go7007-v4l2.c 2021-01-09 20:06:41.056293533 +0100
+++ linux-tbs-drivers/linux/drivers/staging/go7007/go7007-v4l2.c 2021-01-09 20:24:55.676597725 +0100
+++ linux-tbs-drivers/linux/drivers/staging/go7007/go7007-v4l2.c 2021-01-09 20:29:01.946141237 +0100
@@ -34,6 +34,7 @@
#include <linux/i2c.h>
#include <linux/mutex.h>
......
......@@ -21,7 +21,7 @@ source=("http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_$_tbsv
sha256sums=('50a21c0f37c2bf185b377f5287872a86f404988481a67ce391ff1ce28ce37636'
'3fdfa6f14af91b3301f0f29c2a2386a7f84504688c766e714287ad8d450e2a57'
'9c24611fb60913bb49a9a8c85c157d42c698ec78298a7dd458aeab30330331c6')
'50585f371c0ae6dd5010be8b27f5476c0b1c3302fea056c97f9bdb629481bc58')
pkgver() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment