From 464eacdc5380e3b6c60d4380931c96af5a9a1341 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2020 19:49:08 +0000 Subject: [PATCH] libfwupdplugin: Use fu_device_locker_close() --- libfwupdplugin/fu-device-locker.c | 3 ++- libfwupdplugin/fu-usb-device.c | 3 +-- plugins/synaptics-mst/fu-synaptics-mst-device.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libfwupdplugin/fu-device-locker.c b/libfwupdplugin/fu-device-locker.c index 75decb363..0ccdb270f 100644 --- a/libfwupdplugin/fu-device-locker.c +++ b/libfwupdplugin/fu-device-locker.c @@ -80,7 +80,8 @@ fu_device_locker_init (FuDeviceLocker *self) gboolean fu_device_locker_close (FuDeviceLocker *self, GError **error) { - g_return_val_if_fail (FU_IS_DEVICE_LOCKER (self), NULL); + g_return_val_if_fail (FU_IS_DEVICE_LOCKER (self), FALSE); + g_return_val_if_fail (error == NULL || *error == NULL, FALSE); if (!self->device_open) return TRUE; if (!self->close_func (self->device, error)) diff --git a/libfwupdplugin/fu-usb-device.c b/libfwupdplugin/fu-usb-device.c index 03eb02045..89a621aa1 100644 --- a/libfwupdplugin/fu-usb-device.c +++ b/libfwupdplugin/fu-usb-device.c @@ -282,8 +282,7 @@ fu_usb_device_close (FuDevice *device, GError **error) return FALSE; } - g_clear_object (&priv->usb_device_locker); - return TRUE; + return fu_device_locker_close (priv->usb_device_locker, error); } static gboolean diff --git a/plugins/synaptics-mst/fu-synaptics-mst-device.c b/plugins/synaptics-mst/fu-synaptics-mst-device.c index 5d13dbe37..0fe7cea9a 100644 --- a/plugins/synaptics-mst/fu-synaptics-mst-device.c +++ b/plugins/synaptics-mst/fu-synaptics-mst-device.c @@ -964,7 +964,7 @@ fu_synaptics_mst_device_scan_cascade (FuSynapticsMstDevice *self, guint8 layer, /* check recursively for more devices */ if (!fu_device_locker_close (locker, &error_local)) { - g_debug ("faile to close parent: %s", error_local->message); + g_debug ("failed to close parent: %s", error_local->message); continue; } self->mode = FU_SYNAPTICS_MST_MODE_REMOTE;