| Message ID | 20200320210435.8876-1-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Commit | d6f5621e1501d236e0e1762e5cd055eb3c8af25d |
| Headers | show |
| Series |
|
| Related | show |
Hi Laurent, Thanks for your work. On 2020-03-20 23:04:34 +0200, Laurent Pinchart wrote: > This is a partial revert of commit 0028536d70c7, removing a change that > was incorrectly squashed. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > src/libcamera/device_enumerator_udev.cpp | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp > index f5a482e35b86..87638c59761c 100644 > --- a/src/libcamera/device_enumerator_udev.cpp > +++ b/src/libcamera/device_enumerator_udev.cpp > @@ -90,8 +90,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev) > return ret; > } > > - if (!ret) > - addDevice(media); > + addDevice(media); > return 0; > } > > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
Hi Laurent, On 20/03/2020 21:04, Laurent Pinchart wrote: > This is a partial revert of commit 0028536d70c7, removing a change that > was incorrectly squashed. > Oops indeed, Odd to approve a patch that 'technically' knowingly introduces a bug... but here we go Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > src/libcamera/device_enumerator_udev.cpp | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp > index f5a482e35b86..87638c59761c 100644 > --- a/src/libcamera/device_enumerator_udev.cpp > +++ b/src/libcamera/device_enumerator_udev.cpp > @@ -90,8 +90,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev) > return ret; > } > > - if (!ret) > - addDevice(media); > + addDevice(media); > return 0; > } > >
Hi Laurent, On 23/03/2020 11:05, Kieran Bingham wrote: > Hi Laurent, > > On 20/03/2020 21:04, Laurent Pinchart wrote: >> This is a partial revert of commit 0028536d70c7, removing a change that >> was incorrectly squashed. >> > > Oops indeed, Odd to approve a patch that 'technically' knowingly > introduces a bug... but here we go Or in fact perhaps it doesn't - I thought the incorrect addition was part of the fix - but 2/2 tackles it differently. > > Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > >> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> --- >> src/libcamera/device_enumerator_udev.cpp | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp >> index f5a482e35b86..87638c59761c 100644 >> --- a/src/libcamera/device_enumerator_udev.cpp >> +++ b/src/libcamera/device_enumerator_udev.cpp >> @@ -90,8 +90,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev) >> return ret; >> } >> >> - if (!ret) >> - addDevice(media); >> + addDevice(media); >> return 0; >> } >> >> >
diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index f5a482e35b86..87638c59761c 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -90,8 +90,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev) return ret; } - if (!ret) - addDevice(media); + addDevice(media); return 0; }
This is a partial revert of commit 0028536d70c7, removing a change that was incorrectly squashed. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/libcamera/device_enumerator_udev.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)