aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/zoran/zoran_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/pci/zoran/zoran_driver.c')
-rw-r--r--drivers/media/pci/zoran/zoran_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index d07840072337..b6a6c4f171d0 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2501,13 +2501,13 @@ static int zoran_s_jpegcomp(struct file *file, void *__fh,
return res;
}
-static unsigned int
+static __poll_t
zoran_poll (struct file *file,
poll_table *wait)
{
struct zoran_fh *fh = file->private_data;
struct zoran *zr = fh->zr;
- int res = v4l2_ctrl_poll(file, wait);
+ __poll_t res = v4l2_ctrl_poll(file, wait);
int frame;
unsigned long flags;
title='2023-03-01 22:45:08 -0500'>2023-03-01drm/amdgpu/vcn: fix compilation issue with legacy gccbobzhou1-1/+2 2023-03-01drm/amd/display: Extend Freesync over PCon support for more devicesSung Joon Kim1-0/+2 2023-03-01Revert "drm/amd/display: Do not set DRR on pipe commit"Aric Cyr1-0/+3 2023-03-01drm/amd/display: fix shift-out-of-bounds in CalculateVMAndRowBytesAlex Hung1-1/+4 2023-03-01drm/amd/display: Ext displays with dock can't recognized after resumeRyan Lin3-2/+11 2023-03-01drm/amdgpu: fix ttm_bo calltrace warning in psp_hw_finiHoratio Zhang1-3/+3 2023-03-01drm/amdgpu: remove unused variable ringTom Rix1-2/+0 2023-03-01drm/amd/display: fix dm irq error message in gpu recovertiancyin1-2/+2 2023-03-01drm/amd: Fix initialization for nbio 7.5.1Mario Limonciello1-0/+5 2023-03-01drm/amd/display: Don't restrict bpc to 8 bpcHarry Wentland1-1/+1 2023-03-01drm/amdgpu: Make umc_v8_10_convert_error_address static and remove unused var...Candice Li1-10/+5 2023-03-01drm/radeon: Fix eDP for single-display iMac11,2Mark Hawrylak1-2/+3