From patchwork Mon Feb 18 15:34:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 10818403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5359B1575 for ; Mon, 18 Feb 2019 15:34:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F35F29407 for ; Mon, 18 Feb 2019 15:34:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30F3929730; Mon, 18 Feb 2019 15:34:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0742229407 for ; Mon, 18 Feb 2019 15:34:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731083AbfBRPeL (ORCPT ); Mon, 18 Feb 2019 10:34:11 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:42890 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730658AbfBRPeK (ORCPT ); Mon, 18 Feb 2019 10:34:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=SyYbQSNpFioo7BEuIkF3mexft6xBdu7zg3vxy3SHCU0=; b=RhvL3/i1PE6pJoWYNY25a6Wv2 hpFA7ik26KpIwkpEpb3cHrCf+ikUpT8C1oYlidcJjaz9JmDWMpRzYVPwO7jIDpV72eQZMgLZxFqfi 2oSA1TDF7URMW954d8et50Sk9k1IgaD3KJthjQo8UbrRFSurrm3SWFb0+5cSNKUX3nOyZWPE5ZX3b opzwmNTby6VrAsUUxsAuLO6MAAExwqOQgNihnlGtHXlAn2TZqFu9xDGSfyQrC+vQ9DkabPeXxDec8 SF0BK+HQgZJIeMnqLLYSmdeWODlEFu5sJiwHXgswzUizkXGsdeqcfZ+6DmXRUBzS1n6U4DqgKGxkM rQbwlq+Fw==; Received: from 177.96.194.24.dynamic.adsl.gvt.net.br ([177.96.194.24] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gvkvq-0000WS-JA; Mon, 18 Feb 2019 15:34:10 +0000 Received: from mchehab by bombadil.infradead.org with local (Exim 4.91) (envelope-from ) id 1gvkvn-00019j-1G; Mon, 18 Feb 2019 10:34:07 -0500 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Hans Verkuil , Hans Verkuil , Ezequiel Garcia , Sakari Ailus , Kees Cook , Anton Leontiev Subject: [PATCH] media: vim2m: fix build breakage due to a merge conflict Date: Mon, 18 Feb 2019 10:34:06 -0500 Message-Id: X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A merge conflict rised when merging from -rc7. Fix it. Signed-off-by: Mauro Carvalho Chehab --- 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) - cancel_delayed_work_sync(&dev->work_run); + cancel_delayed_work_sync(&ctx->work_run); for (;;) { if (V4L2_TYPE_IS_OUTPUT(q->type))