From patchwork Fri Jun 19 05:41:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4095 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 27EBF603BF for ; Fri, 19 Jun 2020 07:42:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="EMwF9Ee9"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:e972:d773:e99a:4f79]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A8466560; Fri, 19 Jun 2020 07:42:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592545327; bh=4rytgg7NfyKgZ0viLomnAy+wSknPB7xeLvYF6T6EvPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EMwF9Ee9y569ZVZB4z044YGULKAsikyedcnUTCCHK5LLwf9F3wfFve5uW+dikmg0P vf1p/0lRsVtXwUPd7F1hqPytGdS9D0spgKkxFPY83PgapdkHwQOMjEv+Yyh/f9CVdH V4mXgfPZMCs3Ni0yCZnbvxk4SeTB6Dcxu+Ym7Hxw= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Jun 2020 14:41:21 +0900 Message-Id: <20200619054123.19052-16-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619054123.19052-1-paul.elder@ideasonboard.com> References: <20200619054123.19052-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 15/17] v4l2: v4l2_camera_proxy: Don't allow streamon if no buffers have been requested X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 05:42:08 -0000 Make VIDIOC_STREAMON return -EINVAL if no buffers have been allocated with reqbufs. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- New in v2 - split from "Fix v4l2-compliance streaming tests" --- src/v4l2/v4l2_camera_proxy.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 8396f58..a7f987a 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -637,6 +637,9 @@ int V4L2CameraProxy::vidioc_streamon(V4L2CameraFile *cf, int *arg) { LOG(V4L2Compat, Debug) << "Servicing vidioc_streamon fd = " << cf->efd(); + if (bufferCount_ == 0) + return -EINVAL; + if (vcam_->isRunning()) return 0;