| Message ID | 20200419213341.18925-1-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | 058407bb9ba4e122f464b3515f30ae1205ff803d |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, On Mon, Apr 20, 2020 at 00:33, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > 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 <laurent.pinchart@ideasonboard.com > <mailto:laurent.pinchart@ideasonboard.com>> > --- > 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(); LGTM. Reviewed-by: Umang Jain <email@uajain.com> > -- > Regards, > > Laurent Pinchart
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();
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 <laurent.pinchart@ideasonboard.com> --- src/libcamera/device_enumerator_udev.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)