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>

diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index 04250adf58e0d4a8574ffc97db931ce2a73befaa..a27d3052bb62613dccb629f00443e1d0ba102052 100644 (file)
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -905,8 +905,7 @@ static void vim2m_stop_streaming(struct vb2_queue *q)
        struct vb2_v4l2_buffer *vbuf;
        unsigned long flags;
 
-       if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx)
-               cancel_delayed_work_sync(&dev->work_run);
+       cancel_delayed_work_sync(&ctx->work_run);
 
        for (;;) {
                if (V4L2_TYPE_IS_OUTPUT(q->type))