[libcamera-devel] [PATCH 1/2] Revert "libcamera: controls: Don't over-optimize ControlValue layout"

Kieran Bingham kieran.bingham at ideasonboard.com
Mon Mar 23 12:07:50 CET 2020


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 at ideasonboard.com>
> 
>> Signed-off-by: Laurent Pinchart <laurent.pinchart at 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;
>>  	}
>>  
>>
> 

-- 
Regards
--
Kieran


More information about the libcamera-devel mailing list