* [PATCH v2] media: vim2m: fix build breakage due to a merge conflict
@ 2019-02-18 15:52 Mauro Carvalho Chehab
2019-02-18 15:53 ` Hans Verkuil
0 siblings, 1 reply; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2019-02-18 15:52 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Linux Media Mailing List,
Mauro Carvalho Chehab, Hans Verkuil, Ezequiel Garcia, Kees Cook,
Tomasz Figa, Anton Leontiev
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")
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
---
drivers/media/platform/vim2m.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index 04250adf58e0..a27d3052bb62 100644
--- 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))
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] media: vim2m: fix build breakage due to a merge conflict
2019-02-18 15:52 [PATCH v2] media: vim2m: fix build breakage due to a merge conflict Mauro Carvalho Chehab
@ 2019-02-18 15:53 ` Hans Verkuil
0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2019-02-18 15:53 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Ezequiel Garcia,
Kees Cook, Tomasz Figa, Anton Leontiev
On 2/18/19 4:52 PM, Mauro Carvalho Chehab wrote:
> 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")
> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> drivers/media/platform/vim2m.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
> index 04250adf58e0..a27d3052bb62 100644
> --- 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))
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-18 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-18 15:52 [PATCH v2] media: vim2m: fix build breakage due to a merge conflict Mauro Carvalho Chehab
2019-02-18 15:53 ` Hans Verkuil
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).