linux_dsm_epyc7002/drivers/media/platform
Mauro Carvalho Chehab a8566d79f8 media: vim2m: fix build breakage due to a merge conflict
A merge conflict rised when merging from -rc7. Fix it.

In this specific case, we don't need the if anymore, as the
work_run was moved to its rightful place (struct vim2m_ctx).

Fixes: b3e64e5b07 ("media: vim2m: use per-file handler work queue")
Fixes: 240809ef66 ("media: vim2m: only cancel work if it is for right context")
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
2019-02-18 10:55:18 -05:00
..
am437x media: vidioc_cropcap -> vidioc_g_pixelaspect 2018-11-20 13:57:21 -05:00
atmel media: v4l: fwnode: Initialise the V4L2 fwnode endpoints to zero 2018-10-04 16:21:02 -04:00
cadence media: v4l: fwnode: Initialise the V4L2 fwnode endpoints to zero 2018-10-04 16:21:02 -04:00
cec-gpio media: cec-gpio: support 5v testing 2018-07-25 07:12:36 -04:00
coda media: coda: fix decoder capture buffer payload 2019-01-21 15:47:50 -02:00
cros-ec-cec media: platform: Add ChromeOS EC CEC driver 2018-07-13 08:44:46 +01:00
davinci media: videobuf: use u64 for the timestamp internally 2019-02-07 12:11:19 -05:00
exynos4-is media: exynos4-is: convert to DEFINE_SHOW_ATTRIBUTE 2019-01-21 15:40:31 -02:00
exynos-gsc media: exynos-gsc: replace v4l2_crop by v4l2_selection 2018-11-20 13:46:06 -05:00
marvell-ccic media: marvell-ccic: trivial fix to the datasheet URL 2018-12-07 08:25:16 -05:00
meson media: platform: meson-ao-cec: make busy TX warning silent 2018-07-24 17:52:20 -04:00
mtk-jpeg media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
mtk-mdp media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
mtk-vcodec Linux 5.0-rc7 2019-02-18 10:12:12 -05:00
mtk-vpu mm: convert totalram_pages and totalhigh_pages variables to atomic 2018-12-28 12:11:47 -08:00
omap media: videobuf: use u64 for the timestamp internally 2019-02-07 12:11:19 -05:00
omap3isp media: omap3isp: Unregister media device as first 2018-11-06 07:11:06 -05:00
qcom media: venus: helpers: drop setting of timestamp invalid flag 2019-01-25 18:43:55 -02:00
rcar-vin media: rcar-vin: fix wrong return value in rvin_set_channel_routing() 2019-01-21 15:41:57 -02:00
rockchip/rga media: rockchip/rga: constify video_device structure 2018-11-23 06:07:06 -05:00
s3c-camif media updates for v4.20-rc1 2018-10-31 10:53:29 -07:00
s5p-cec media: s5p-cec: add NACK detection support 2017-09-23 07:29:30 -04:00
s5p-g2d media: s5p-g2d: convert g/s_crop to g/s_selection 2018-11-20 13:53:57 -05:00
s5p-jpeg media: s5p-jpeg: Correct step and max values for V4L2_CID_JPEG_RESTART_INTERVAL 2019-01-16 12:39:11 -05:00
s5p-mfc media: s5p-mfc: fix incorrect bus assignment in virtual child device 2019-01-07 14:39:36 -05:00
seco-cec media: secocec: fix ir address shift 2019-01-16 11:44:50 -05:00
soc_camera media: soc_camera_platform: remove obsolete soc_camera test driver 2019-01-21 15:24:56 -02:00
sti media: platform: sti: remove bdisp_dbg_declare() and hva_dbg_declare() 2019-01-21 15:41:17 -02:00
stm32 media: v4l: fwnode: Initialise the V4L2 fwnode endpoints to zero 2018-10-04 16:21:02 -04:00
sunxi/sun6i-csi media: sun6i: Add H3 compatible 2019-01-16 13:33:21 -05:00
tegra-cec media: tegra-cec: reset rx_buf_cnt when start bit detected 2018-03-05 07:46:24 -05:00
ti-vpe media: Use of_node_name_eq for node name comparisons 2018-12-07 08:28:54 -05:00
vicodec media: v4l2-mem2mem: Rename v4l2_m2m_buf_copy_data to v4l2_m2m_buf_copy_metadata 2019-02-07 12:36:33 -05:00
vimc media: vimc: fill in bus_info in media_device_info 2019-02-07 12:38:59 -05:00
vivid media: vivid: add vertical down sampling to imagesize calc 2019-02-07 12:24:03 -05:00
vsp1 media: vsp1: Fix trivial documentation 2019-01-16 11:18:49 -05:00
xilinx media: Use of_node_name_eq for node name comparisons 2018-12-07 08:28:54 -05:00
aspeed-video.c media: platform: Fix missing spin_lock_init() 2019-01-07 13:54:01 -05:00
fsl-viu.c media: videobuf: use u64 for the timestamp internally 2019-02-07 12:11:19 -05:00
imx-pxp.c media: imx-pxp: fix duplicated if condition 2019-02-07 11:48:40 -05:00
imx-pxp.h media: imx-pxp: add i.MX Pixel Pipeline driver 2018-09-11 13:32:17 -04:00
Kconfig media: seco-cec: fix RC_CORE dependency 2019-01-16 11:42:34 -05:00
m2m-deinterlace.c media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
Makefile media: platform: Add Aspeed Video Engine driver 2018-12-12 12:05:12 -05:00
mx2_emmaprp.c media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
pxa_camera.c media: pxa_camera: fix smatch warning 2019-02-07 12:38:24 -05:00
rcar_drif.c media updates for v4.20-rc1 2018-10-31 10:53:29 -07:00
rcar_fdp1.c media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
rcar_jpu.c media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
rcar-fcp.c Char/Misc driver patches for 4.19-rc1 2018-08-18 11:04:51 -07:00
renesas-ceu.c media: renesas-ceu: Use default mbus settings 2018-10-04 16:25:33 -04:00
sh_veu.c media: use strscpy() instead of strlcpy() 2018-09-11 13:32:17 -04:00
sh_vou.c media: doc-rst: Fix broken references 2018-11-23 05:42:49 -05:00
via-camera.c media: replace strcpy() by strscpy() 2018-09-11 13:32:17 -04:00
via-camera.h media: fix usage of whitespaces and on indentation 2018-01-04 13:12:01 -05:00
video-mux.c media: platform: video-mux: Register a subdev notifier 2018-10-04 15:35:08 -04:00
vim2m.c media: vim2m: fix build breakage due to a merge conflict 2019-02-18 10:55:18 -05:00