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

..

cec

media: cec: keep track of outstanding transmits

2018-11-23 05:56:14 -05:00

common

media: videobuf: use u64 for the timestamp internally

2019-02-07 12:11:19 -05:00

dvb-core

media: dvb_frontend: add debug message for frequency intervals

2018-11-23 11:59:45 -05:00

dvb-frontends

media: dvb: Add check on sp8870_readreg

2019-01-16 11:45:33 -05:00

firewire

media: firewire: Fix app_info parameter type in avc_ca{,_app}_info

2018-12-05 05:34:33 -05:00

i2c

media: ov2640: fix initial try format

2019-01-25 11:02:04 -02:00

mmc

media: siano: use GFP_DMA only for smssdio

2018-05-15 08:04:42 -04:00

pci

Merge tag 'v5.0-rc7' into patchwork

2019-02-18 10:12:12 -05:00

platform

media: vim2m: fix build breakage due to a merge conflict

2019-02-18 10:55:18 -05:00

radio

media: si470x-i2c: Add optional reset-gpio support

2019-01-21 15:36:18 -02:00

rc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2018-12-27 13:04:52 -08:00

spi

media: cxd2880-spi: fix two memory leaks of dvb_spi

2019-01-16 11:44:29 -05:00

tuners

media: si2157: declare its own pads

2018-09-17 13:16:19 -04:00

usb

media: hdpvr: fix smatch warning

2019-02-07 12:37:17 -05:00

v4l2-core

media: v4l: ioctl: Sanitize num_planes before using it

2019-02-18 10:13:38 -05:00

Kconfig

media: Add a Kconfig option for the Request API

2018-12-05 13:07:43 -05:00

Makefile

media: media-request: implement media requests

2018-08-31 11:04:51 -04:00

media-device.c

media: Add a Kconfig option for the Request API

2018-12-05 13:07:43 -05:00

media-devnode.c

MAINTAINERS & files: Canonize the e-mails I use at files

2018-05-04 06:21:06 -04:00

media-entity.c

media: v4l2-mc: switch it to use the new approach to setup pipelines

2018-09-17 13:16:19 -04:00

media-request.c

media: media-request: Add compat ioctl

2018-11-20 12:53:27 -05:00