Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2376927ybl; Thu, 19 Dec 2019 12:30:53 -0800 (PST) X-Google-Smtp-Source: APXvYqyCZSpfOsWZtm3sD9frdNW8R3uKh0AM+8yuJo9KWrdv29l33TKtWJ7qeRvhzi7WvVF3SChr X-Received: by 2002:a05:6830:1e2d:: with SMTP id t13mr10990601otr.128.1576787452870; Thu, 19 Dec 2019 12:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576787452; cv=none; d=google.com; s=arc-20160816; b=mxafKYN+POAAZpel0DTTj452oDoN2zeoY5O3fCSKechynDDSI3fqiu9Qz7hMzx/swR c4GufAiRPfUFAXTurLpxXHvZflVzKrYoaoR31qC9NUG70gyQpI4RlGC3bnKJCuafSWw5 1nLMNgXguWOK9Iaa6ftsckfr0b/suLSW8Mm+ip0MANzyFKNNxCxP43Knaxc+3mGrfmlD /DDMYvDW4NAk0ZnAI6LV1KISazmnZw67iMOImkmwfa+D897d3YualYuIsnTLWTIq+WCo Uv8d2TPDo6o93AoYXtiXPSccCxQ9e33+AfQqvUdWvWOuOeJ7VCmfzVD6TwtjDlzOpGtr emaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=0ku3WkybWuYyol2wbhhnHdNuHA1Lkwj9hheWjbC7/44=; b=lZvn5LoxYdpkiFTrUoB8z+3hY+BPRPTsviwQA+2vAvXC6QhzKNBqdmamK5IxgADcsS fz5xk0E7nFMoZXGJQKU4UfkThWnjD1TmCSjGuotLZoUQGPs8T+QO4Gcvp8KjBZ6wsmL2 V4FdUcBIyzTik1g7238UH8wtMvJqYGmSysI8MJwRnflmqGxduBhwkHDOatMt8KF/o5h8 j8SvikwfpyeurtsYUw3F4m8BhHKFtMEVzwVDVpVP2w7mJbQfz4HDUHQSWBGBtIApHIxl FTh2o+nJ9i7CA8Pfvtw3wVrWSdThfkQ7ceTwHO+LDcacA0mkiKsw/rFRoabraYHz6Txq /lig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=mpjePlJ9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m16si3799523otl.265.2019.12.19.12.30.40; Thu, 19 Dec 2019 12:30:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@umn.edu header.s=google header.b=mpjePlJ9; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=umn.edu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727386AbfLSU33 (ORCPT + 99 others); Thu, 19 Dec 2019 15:29:29 -0500 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:36256 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726869AbfLSU32 (ORCPT ); Thu, 19 Dec 2019 15:29:28 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 47f3Q01hBQz9vZ2N for ; Thu, 19 Dec 2019 20:29:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M47UayY1okcF for ; Thu, 19 Dec 2019 14:29:28 -0600 (CST) Received: from mail-yw1-f69.google.com (mail-yw1-f69.google.com [209.85.161.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id 47f3Q00g9gz9vZ1d for ; Thu, 19 Dec 2019 14:29:28 -0600 (CST) Received: by mail-yw1-f69.google.com with SMTP id r189so4914413ywf.13 for ; Thu, 19 Dec 2019 12:29:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0ku3WkybWuYyol2wbhhnHdNuHA1Lkwj9hheWjbC7/44=; b=mpjePlJ9nPLL6pMoZa3NMUzvBxSAij80+5mlgV8hUi54WoJWZLHaB1FG/vLn1EdBgz OTQFltozEQxjVG/v/d+TIY4qH29YAaXEY0GdZ2Q4m5H8GdzRVH9Nn8cpJbJQ0qogLXwe fRlU+87eCFwqfnjW5fD0j+z3TEeAPkk4uj8j5XOKPhm+A4NS/OFNixKQ9/vIVigktPov GqCbDQtgf/KX+CaXiwU/2SxPjeuyl6JKhlV7VAufsEeGYAlMDiMuUVUGGzrMgCuHPMFr cvLxMHOQElgXGKMUieRTJXPAD8XZ1CXyKvIrNR7SHpIKHTB8LrehERXROw5KIOlGtLpz dcSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0ku3WkybWuYyol2wbhhnHdNuHA1Lkwj9hheWjbC7/44=; b=auZgii8Y++5dFW+SDBO+N1ejCibylyUij4fvZmv1N9jKQ0W35UyjER2SGxZhWWU22x i9f1VxSIFqbL4ZpWxcCh5KYLR1SPbTBHf0V0u/pxGwl6vH5Rppxm2qyvz+NQlw2jEZMv sEUB9aH7JlFbSWcFxZIEmo5wxjj4W1+7eSWfwFuVg5F4W+4dJ2xX92y3dZ+D3EQfJTEW iJfbV9gzk5y2zLEwSbdT0DVDwf0IpoBokI/vzNrrVGLQz7riTyiXe6ia1+QsexhjbjNl 19KoV8bV+DYo8qj2jmjx7uMtwFW0xLQRMlES1q5df7X8aeyBJi+KZqS+LHHcVAZ9oeik Om8g== X-Gm-Message-State: APjAAAVY81DmeNkjwrGKKwoexo+4N7NBfI2GaYmWCjg6iYSPK5BxsgMW /hhJVZBoYb0FkaTdVOTCztlX4O1GcB7hZAXrVE0+Zfw1ImMeZxMl9F4u82badNN98C82cVFVQmb IiId2KMjh6Rq7QkRK7bUP0f2VwCFV X-Received: by 2002:a81:3a0b:: with SMTP id h11mr7820043ywa.217.1576787367604; Thu, 19 Dec 2019 12:29:27 -0800 (PST) X-Received: by 2002:a81:3a0b:: with SMTP id h11mr7820030ywa.217.1576787367403; Thu, 19 Dec 2019 12:29:27 -0800 (PST) Received: from cs-u-syssec1.dtc.umn.edu (cs-u-syssec1.cs.umn.edu. [128.101.106.66]) by smtp.gmail.com with ESMTPSA id w128sm2827126ywf.72.2019.12.19.12.29.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 12:29:27 -0800 (PST) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Hans Verkuil , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] media: media/saa7146: fix incorrect assertion in saa7146_buffer_finish Date: Thu, 19 Dec 2019 14:29:24 -0600 Message-Id: <20191219202924.24194-1-pakki001@umn.edu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In saa7146_buffer_finish, the code for q->curr to be NULL is already present and asserting for NULL is unnecessary. This patch elimiates such a check. Signed-off-by: Aditya Pakki --- drivers/media/common/saa7146/saa7146_fops.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index aabb830e7468..d7e83b55ddca 100644 --- a/drivers/media/common/saa7146/saa7146_fops.c +++ b/drivers/media/common/saa7146/saa7146_fops.c @@ -97,8 +97,6 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, DEB_EE("dev:%p, dmaq:%p, state:%d\n", dev, q, state); DEB_EE("q->curr:%p\n", q->curr); - BUG_ON(!q->curr); - /* finish current buffer */ if (NULL == q->curr) { DEB_D("aiii. no current buffer\n"); -- 2.20.1