mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
Merge branch 'master' into latest
This commit is contained in:
@@ -28,6 +28,9 @@ add drx39xxj.patch
|
||||
add ccs.patch
|
||||
add rc-cec.patch
|
||||
|
||||
[6.10.1023]
|
||||
add v6.10_bt8xx.patch
|
||||
|
||||
[6.9.1023]
|
||||
add v6.9_i2c_mux.patch
|
||||
add v6.9_i2c_mux_tbs.patch
|
||||
|
16
backports/v6.10_bt8xx.patch
Normal file
16
backports/v6.10_bt8xx.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
diff --git a/drivers/media/pci/bt8xx/bttv-gpio.c b/drivers/media/pci/bt8xx/bttv-gpio.c
|
||||
index 59a6f160aac7..6b7fea50328c 100644
|
||||
--- a/drivers/media/pci/bt8xx/bttv-gpio.c
|
||||
+++ b/drivers/media/pci/bt8xx/bttv-gpio.c
|
||||
@@ -28,9 +28,9 @@
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/* internal: the bttv "bus" */
|
||||
|
||||
-static int bttv_sub_bus_match(struct device *dev, const struct device_driver *drv)
|
||||
+static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv)
|
||||
{
|
||||
- const struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
|
||||
+ struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
|
||||
int len = strlen(sub->wanted);
|
||||
|
||||
if (0 == strncmp(dev_name(dev), sub->wanted, len))
|
@@ -70,7 +70,7 @@ sub check_other_dependencies()
|
||||
check_files_for_func("BUS_CEC", "NEED_BUS_CEC", "include/uapi/linux/input.h");
|
||||
check_files_for_func("kthread_init_worker", "NEED_KTHREAD_INIT_WORKER", "include/linux/kthread.h");
|
||||
check_files_for_func("print_hex_dump_debug", "NEED_PRINT_HEX_DUMP_DEBUG", "include/linux/printk.h");
|
||||
check_files_for_func("min3", "NEED_MIN3", "include/linux/kernel.h");
|
||||
check_files_for_func("min3", "NEED_MIN3", "include/linux/kernel.h", "include/linux/minmax.h");
|
||||
check_files_for_func("rcu_pointer_handoff", "NEED_RCU_POINTER_HANDOFF", "include/linux/rcupdate.h");
|
||||
check_files_for_func("regmap_read_poll_timeout", "NEED_REGMAP_READ_POLL_TIMEOUT", "include/linux/regmap.h");
|
||||
check_files_for_func("dma_coerce_mask_and_coherent", "NEED_DMA_COERCE_MASK", "include/linux/dma-mapping.h");
|
||||
|
Reference in New Issue
Block a user