From patchwork Sat Apr 3 23:58:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11834 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 52586BD695 for ; Sat, 3 Apr 2021 23:59:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A6873602E5; Sun, 4 Apr 2021 01:59:28 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="pnRs0jCX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B70F0602CE for ; Sun, 4 Apr 2021 01:59:26 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8A0FA8A0; Sun, 4 Apr 2021 01:59:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1617494366; bh=XAlW/gI0gkPsYbb08d5glB9ozdcaSoFM7ry3lWt3G58=; h=From:To:Cc:Subject:Date:From; b=pnRs0jCXO1u2J+Ln+JHbHgjmbmiw7O0CHH9Q+l1xfoxmKO+bJHIZm4F/eE/qgDSa0 gYXx7hYGvvTEUWtE3jQAmzg9lVUoQuimn2TbobS3Bib7oy6pBpzQrQq8ZjPAiu0c/A 5X0+Doo2x3WdmQaSJqFsS27oNGkIs6vAxdmpw0dQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 4 Apr 2021 02:58:38 +0300 Message-Id: <20210403235838.21594-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] android: mm: cros: Fix compilation 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Commit 7d7879833812 ("android: mm: cros: Handle buffer registration failure") mistakenly tried to initialize the CameraBuffer::Private registered member variable instead of registered_. This reults in a compilation failure. Fix it. Fixes: 7d7879833812 ("android: mm: cros: Handle buffer registration failure") Signed-off-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- src/android/mm/cros_camera_buffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) I failed to catch this before pushing :-( Sorry. I'll push the fix right away to fix the compilation breakage. diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index 2a82d4b7c470..1a4fd5d1dfe3 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -50,7 +50,7 @@ private: CameraBuffer::Private::Private(CameraBuffer *cameraBuffer, buffer_handle_t camera3Buffer, int flags) : Extensible::Private(cameraBuffer), handle_(camera3Buffer), - numPlanes_(0), valid_(false), registered(false) + numPlanes_(0), valid_(false), registered_(false) { bufferManager_ = cros::CameraBufferManager::GetInstance();