proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-06-25 10:05:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libfwupdplugin: Use fu_device_locker_close()

Browse Source
This commit is contained in:
Richard Hughes 2020-03-26 19:49:08 +00:00 committed by Mario Limonciello
parent d66a445ada
commit 464eacdc53
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libfwupdplugin/fu-device-locker.c
View File

@ -80,7 +80,8 @@ fu_device_locker_init (FuDeviceLocker *self)
gboolean gboolean
fu_device_locker_close (FuDeviceLocker *self, GError **error) 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) if (!self->device_open)
return TRUE; return TRUE;
if (!self->close_func (self->device, error)) if (!self->close_func (self->device, error))

3
libfwupdplugin/fu-usb-device.c
View File

@ -282,8 +282,7 @@ fu_usb_device_close (FuDevice *device, GError **error)
return FALSE; return FALSE;
} }
g_clear_object (&priv->usb_device_locker); return fu_device_locker_close (priv->usb_device_locker, error);
return TRUE;
} }
static gboolean static gboolean

2
plugins/synaptics-mst/fu-synaptics-mst-device.c
View File

@ -964,7 +964,7 @@ fu_synaptics_mst_device_scan_cascade (FuSynapticsMstDevice *self, guint8 layer,
/* check recursively for more devices */ /* check recursively for more devices */
if (!fu_device_locker_close (locker, &error_local)) { 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; continue;
} }
self->mode = FU_SYNAPTICS_MST_MODE_REMOTE; self->mode = FU_SYNAPTICS_MST_MODE_REMOTE;