ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-22 20:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

media: pci/tbscapture2: Compatibility fix for 6.14+ kernels.

Browse Source
This commit is contained in:
CrazyCat
2025-04-06 18:38:25 +03:00
parent b68595ce48
commit b4a40fd7cc
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/pci/tbscapture2/tbs_pcie2-reg.h
View File

@@ -1,5 +1,5 @@
/* /*
TurboSight PCIex2 HDMI capture cards driver TurboSight PCIe 2.0 HDMI capture cards driver
Copyright (C) 2024 www.tbsdtv.com Copyright (C) 2024 www.tbsdtv.com
*/ */

17
drivers/media/pci/tbscapture2/tbs_pcie2.c
View File

@@ -1,5 +1,5 @@
/* /*
TurboSight PCIex2 HDMI capture cards driver TurboSight PCIe 2.0 HDMI capture cards driver
Copyright (C) 2024 www.tbsdtv.com Copyright (C) 2024 www.tbsdtv.com
*/ */
@@ -1670,7 +1670,7 @@ static int tbs_pcie_audio_copy_user(struct snd_pcm_substream *substream,
ret = copy_to_user(dst,runtime->dma_area+pos,count); ret = copy_to_user(dst,runtime->dma_area+pos,count);
return 0; return 0;
} }
#else #elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 14, 0)
static int tbs_pcie_audio_copy(struct snd_pcm_substream *substream, int channel, static int tbs_pcie_audio_copy(struct snd_pcm_substream *substream, int channel,
unsigned long pos, struct iov_iter *iter, unsigned long bytes) unsigned long pos, struct iov_iter *iter, unsigned long bytes)
{ {
@@ -1680,6 +1680,17 @@ static int tbs_pcie_audio_copy(struct snd_pcm_substream *substream, int channel,
ret = copy_to_iter_fromio(iter,runtime->dma_area+pos,bytes); ret = copy_to_iter_fromio(iter,runtime->dma_area+pos,bytes);
return 0; return 0;
};
#else
static int tbs_pcie_audio_copy(struct snd_pcm_substream *substream, int channel,
unsigned long pos, struct iov_iter *iter, unsigned long bytes)
{
struct snd_pcm_runtime *runtime = substream->runtime;
size_t ret;
// printk(KERN_INFO "%s() index:%x\n",__func__,chip->index);
ret = copy_to_iter_fromio(runtime->dma_area+pos,bytes,iter);
return 0;
}; };
#endif #endif
@@ -2261,7 +2272,7 @@ static __exit void pcie_tbs_exit(void)
module_init(pcie_tbs_init); module_init(pcie_tbs_init);
module_exit(pcie_tbs_exit); module_exit(pcie_tbs_exit);
MODULE_DESCRIPTION("TBS PCIEx2 HDMI capture driver"); MODULE_DESCRIPTION("TBS PCIE 2.0 HDMI capture driver");
MODULE_AUTHOR("tbs"); MODULE_AUTHOR("tbs");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION("1.0"); MODULE_VERSION("1.0");

4
drivers/media/pci/tbscapture2/tbs_pcie2.h
View File

@@ -1,6 +1,6 @@
/* /*
TurboSight PCIex2 HDMI capture cards driver TurboSight PCIe 2.0 HDMI capture cards driver
Copyright (C) 2024 www.tbsdtv.com Copyright (C) 2025 www.tbsdtv.com
*/ */
#ifndef _TBS_PCIE2_H_ #ifndef _TBS_PCIE2_H_