From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3583AC742BA for ; Fri, 12 Jul 2019 12:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03B76208E4 for ; Fri, 12 Jul 2019 12:24:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934270; bh=I6SLxy3JxmLRF8Y/fRbe5of/Af9MI5t5AuY12Ql3XQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Kz3oya/9fRq5oeaLznWfhrjnweSPkpDcGAoPAFpPjn/3JAVDrGGVai0buFiaRqnyH iu13yDUrWa7XxR5bKDggI2hS0DzuTDErrKNT1r3/OH8rQJ3Lhf5dTx9kQHTlt3svox QO6WFDhzu16tqG6ci22VpLn+fPgf/7RxiQMKXo/U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728126AbfGLMY2 (ORCPT ); Fri, 12 Jul 2019 08:24:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:33082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728116AbfGLMY2 (ORCPT ); Fri, 12 Jul 2019 08:24:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 182622084B; Fri, 12 Jul 2019 12:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934267; bh=I6SLxy3JxmLRF8Y/fRbe5of/Af9MI5t5AuY12Ql3XQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OcZ7fFruPFpR32tWGexbZa/qOMMaZAl8d/a3Xb8YpkcHh6v1eZ0V51QQL/4QV5ENY Y/i7uI016xqIgEW0kP5DwEbHh32az7Svqyzu3n6IUSHqwQ5GgCVDjwiYaqNMSkRfAm N6qi5T+DyqGVAoZ2Rq3R0S8v8NGTXD8JzYv42gsw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Stevenson , Stefan Wahren , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.19 89/91] staging: bcm2835-camera: Remove check of the number of buffers supplied Date: Fri, 12 Jul 2019 14:19:32 +0200 Message-Id: <20190712121626.482469113@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121621.422224300@linuxfoundation.org> References: <20190712121621.422224300@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dave Stevenson commit bb8e97006d701ae725a177f8f322e5a75fa761b7 upstream. Before commit "staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping" there was a need to ensure that there were sufficient buffers supplied from the user to cover those being sent to the VPU (always 1). Now the buffers are linked 1:1 between MMAL and V4L2, therefore there is no need for that check, and indeed it is wrong as there is no need to submit all the buffers before starting streaming. Fixes: 938416707071 ("staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping") Signed-off-by: Dave Stevenson Signed-off-by: Stefan Wahren Acked-by: Hans Verkuil Acked-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 10 ---------- 1 file changed, 10 deletions(-) --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c @@ -1329,16 +1329,6 @@ static int port_enable(struct vchiq_mmal if (port->enabled) return 0; - /* ensure there are enough buffers queued to cover the buffer headers */ - if (port->buffer_cb) { - hdr_count = 0; - list_for_each(buf_head, &port->buffers) { - hdr_count++; - } - if (hdr_count < port->current_buffer.num) - return -ENOSPC; - } - ret = port_action_port(instance, port, MMAL_MSG_PORT_ACTION_TYPE_ENABLE); if (ret)