NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: device_enumerator: Don't stop if one device fails

Browse source 
If one device fails to enumerate, which isn't supposed to happen under
normal conditions, both the sysfs and the udev enumerators stop
enumeration of further devices. This potentially prevents working
devices from being detected and handled. Fix it by skipping the faulty
device.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2020-02-14 14:30:52 +02:00
parent 475f9b9b02
commit 68daa9302f
2 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcamera/device_enumerator_sysfs.cpp
View file

@ -33,7 +33,6 @@ int DeviceEnumeratorSysfs::enumerate()
{
struct dirent *ent;
DIR *dir;
int ret = 0;
static const char * const sysfs_dirs[] = {
"/sys/subsystem/media/devices",
@ -74,14 +73,15 @@ int DeviceEnumeratorSysfs::enumerate()
}
std::shared_ptr<MediaDevice> media = createDevice(devnode);
if (!media) {
ret = -ENODEV;
break;
}
if (!media)
continue;
if (populateMediaDevice(media) < 0) {
ret = -ENODEV;
break;
LOG(DeviceEnumerator, Warning)
<< "Failed to populate media device "
<< media->deviceNode()
<< " (" << media->driver() << "), skipping";
continue;
}
addDevice(media);
@ -89,7 +89,7 @@ int DeviceEnumeratorSysfs::enumerate()
closedir(dir);
return ret;
return 0;
}
int DeviceEnumeratorSysfs::populateMediaDevice(const std::shared_ptr<MediaDevice> &media)

25
src/libcamera/device_enumerator_udev.cpp
View file

@ -82,8 +82,15 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)
return -ENODEV;
int ret = populateMediaDevice(media);
if (ret == 0)
addDevice(media);
if (ret < 0) {
LOG(DeviceEnumerator, Warning)
<< "Failed to populate media device "
<< media->deviceNode()
<< " (" << media->driver() << "), skipping";
return ret;
}
addDevice(media);
return 0;
}
@ -141,14 +148,18 @@ int DeviceEnumeratorUdev::enumerate()
devnode = udev_device_get_devnode(dev);
if (!devnode) {
udev_device_unref(dev);
ret = -ENODEV;
goto done;
LOG(DeviceEnumerator, Warning)
<< "Failed to get device node for '"
<< syspath << "', skipping";
continue;
}
ret = addUdevDevice(dev);
if (addUdevDevice(dev) < 0)
LOG(DeviceEnumerator, Warning)
<< "Failed to add device for '"
<< syspath << "', skipping";
udev_device_unref(dev);
if (ret < 0)
break;
}
done: