summaryrefslogtreecommitdiff
path: root/drivers/mfd/twl4030-irq.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 10:29:31 -0500
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-02-18 10:55:18 -0500
commita8566d79f8ffb09a9d046bc98eb7ab59c79c6b58 (patch)
tree3891c0e8f7f154330d50c55e969193fd20dff3a5 /drivers/mfd/twl4030-irq.c
parent14c8e80e68695c2b9342112c39263a79e0963461 (diff)
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: b3e64e5b0778 ("media: vim2m: use per-file handler work queue") Fixes: 240809ef6630 ("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>
Diffstat (limited to 'drivers/mfd/twl4030-irq.c')
0 files changed, 0 insertions, 0 deletions