Commit 3dbcf378 authored by schrieveslaach's avatar schrieveslaach

Fix patch file: further compile errors

parent 759b460b
......@@ -154,6 +154,32 @@ diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cx18/cx18-driver.c lin
#include "cx18-driver.h"
#include "cx18-io.h"
#include "cx18-version.h"
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cx231xx/cx231xx-i2c.c linux-tbs-drivers/linux/drivers/media/video/cx231xx/cx231xx-i2c.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2021-01-09 20:06:41.079626964 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2021-01-09 21:13:51.810605077 +0100
@@ -480,7 +480,7 @@
BUG_ON(!dev->cx231xx_send_usb_command);
memcpy(&bus->i2c_adap, &cx231xx_adap_template, sizeof(bus->i2c_adap));
- memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));
+ // FIXME: memcpy(&bus->i2c_algo, &cx231xx_algo, sizeof(bus->i2c_algo));
memcpy(&bus->i2c_client, &cx231xx_client_template,
sizeof(bus->i2c_client));
diff -ruN linux-tbs-drivers-bak/linux/drivers/media/video/cx23885/cx23885-i2c.c linux-tbs-drivers/linux/drivers/media/video/cx23885/cx23885-i2c.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/cx23885/cx23885-i2c.c 2021-01-09 20:06:41.079626964 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/cx23885/cx23885-i2c.c 2021-01-09 21:14:17.637159240 +0100
@@ -317,8 +317,8 @@
memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
sizeof(bus->i2c_adap));
- memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template,
- sizeof(bus->i2c_algo));
+ // FIXME: memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template,
+ // sizeof(bus->i2c_algo));
memcpy(&bus->i2c_client, &cx23885_i2c_client_template,
sizeof(bus->i2c_client));
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:29:01.942807911 +0100
......@@ -232,9 +258,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/sh_mobile_ceu_camera.c linux-tbs-drivers/linux/drivers/media/video/sh_mobile_ceu_camera.c
--- linux-tbs-drivers-bak/linux/drivers/media/video/sh_mobile_ceu_camera.c 2021-01-09 20:06:41.052960186 +0100
+++ linux-tbs-drivers/linux/drivers/media/video/sh_mobile_ceu_camera.c 2021-01-09 21:19:54.015777193 +0100
@@ -2027,7 +2027,7 @@
err = dma_declare_coherent_memory(&pdev->dev, res->start,
res->start,
resource_size(res),
- DMA_MEMORY_MAP |
+ V4L2_MEMORY_MAP |
DMA_MEMORY_EXCLUSIVE);
if (!err) {
dev_err(&pdev->dev, "Unable to declare CEU memory.\n");
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
+++ linux-tbs-drivers/linux/drivers/media/video/tlg2300/pd-common.h 2021-01-09 21:20:17.105686744 +0100
@@ -258,7 +258,7 @@
#else
#define in_hibernation(pd) (0)
......
......@@ -21,7 +21,7 @@ source=("http://www.tbsdtv.com/download/document/common/tbs-linux-drivers_$_tbsv
sha256sums=('50a21c0f37c2bf185b377f5287872a86f404988481a67ce391ff1ce28ce37636'
'3fdfa6f14af91b3301f0f29c2a2386a7f84504688c766e714287ad8d450e2a57'
'8ec8ea010ab395a9dd2003c6132b880cabf6ac9735a8a1a8d618f34e2a906c0e')
'f4daf35aba3179a0c9f1bcc6ac52ce5c1c6d5b6b4c29406262e3ff204e59a2d0')
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