| Message ID | c81314716b420ffcbd34f156af86a8f7d77368e1.1550504042.git.mchehab+samsung@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: vim2m: fix build breakage due to a merge conflict | expand |
On 2/18/19 4:34 PM, Mauro Carvalho Chehab wrote: > A merge conflict rised when merging from -rc7. Fix it. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > --- > drivers/media/platform/vim2m.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c > index 04250adf58e0..3e4cda2db0bf 100644 > --- a/drivers/media/platform/vim2m.c > +++ b/drivers/media/platform/vim2m.c > @@ -902,11 +902,12 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned count) > static void vim2m_stop_streaming(struct vb2_queue *q) > { > struct vim2m_ctx *ctx = vb2_get_drv_priv(q); > + struct vim2m_dev *dev = ctx->dev; > struct vb2_v4l2_buffer *vbuf; > unsigned long flags; > > if (v4l2_m2m_get_curr_priv(dev->m2m_dev) == ctx) I don't think this test is needed anymore since the work queue is now per context. So the 'if' can be dropped, and instead just cancel ctx->work_run. Nasty little conflict, for once not that easy to analyze. Regards, Hans > - cancel_delayed_work_sync(&dev->work_run); > + cancel_delayed_work_sync(&ctx->work_run); > > for (;;) { > if (V4L2_TYPE_IS_OUTPUT(q->type)) >
diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c index 04250adf58e0..3e4cda2db0bf 100644 --- a/drivers/media/platform/vim2m.c +++ b/drivers/media/platform/vim2m.c @@ -902,11 +902,12 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned count) static void vim2m_stop_streaming(struct vb2_queue *q) { struct vim2m_ctx *ctx = vb2_get_drv_priv(q); + struct vim2m_dev *dev = ctx->dev; 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))
A merge conflict rised when merging from -rc7. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> --- drivers/media/platform/vim2m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)