From patchwork Sun Apr 19 21:33:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3503 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A596860400 for ; Sun, 19 Apr 2020 23:33:57 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oeHH0wBc"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1B148528 for ; Sun, 19 Apr 2020 23:33:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1587332037; bh=MW5l7KG96oACxPw12TBLfAr9rot42GS+8akrHqNLCzU=; h=From:To:Subject:Date:From; b=oeHH0wBc7+TQN8angTnAuiYO9yfVoSuQgtasDyBPOJyEmDv2gpFqo2va7dWYxnIQ7 NFM0c8a+/AkYsRT+IeRIwJMYU9ZUwQGvmS92qhIlgWK3Xe2wJSSLyITJMykEHrFld9 u3cZeg9ldmA/m6uk82l8u3VgCxTyZLX4k9OOPOek= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Apr 2020 00:33:41 +0300 Message-Id: <20200419213341.18925-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.25.3 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: device_enumerator_udev: Log the right number of missing deps 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: Sun, 19 Apr 2020 21:33:58 -0000 Since commit e75ef59e028e ("libcamera: device_enumerator_udev: Update pending list in addUdevDevice") the populateMediaDevice() function returns 0 on success instead of the number of missing dependencies, resulting in a wrong number being logged. Fix it. Fixes: e75ef59e028e ("libcamera: device_enumerator_udev: Update pending list in addUdevDevice") Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/libcamera/device_enumerator_udev.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index 9cbc7e47d2d9..2e33c898aeef 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -94,7 +94,8 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev) if (!deps.empty()) { LOG(DeviceEnumerator, Debug) << "Defer media device " << media->deviceNode() - << " due to " << ret << " missing dependencies"; + << " due to " << deps.size() + << " missing dependencies"; pending_.emplace_back(std::move(media), std::move(deps)); MediaDeviceDeps *mediaDeps = &pending_.back();