proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 13:59:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not skip attach() if the device is marked _WILL_DISAPPEAR

Browse Source 
The idea here is that the device would not come back after it was restarted,
and skipping the attach in the engine was only working around the fact that the
ebitdo did not split out an ->attach() function.

We can't really blame it; we only decoupled the _IS_BOOTLOADER requirement
for ->attach() recently...
This commit is contained in:
Richard Hughes 2020-04-16 11:57:17 +01:00 committed by Mario Limonciello
parent c727742df3
commit 1283c2696d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/ebitdo/fu-ebitdo-device.c
View File

@ -511,6 +511,16 @@ fu_ebitdo_device_write_firmware (FuDevice *device,
return FALSE; return FALSE;
} }
/* success! */
return TRUE;
}
static gboolean
fu_ebitdo_device_attach (FuDevice *device, GError **error)
{
GUsbDevice *usb_device = fu_usb_device_get_dev (FU_USB_DEVICE (device));
g_autoptr(GError) error_local = NULL;
/* when doing a soft-reboot the device does not re-enumerate properly /* when doing a soft-reboot the device does not re-enumerate properly
* so manually reboot the GUsbDevice */ * so manually reboot the GUsbDevice */
fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART); fu_device_set_status (device, FWUPD_STATUS_DEVICE_RESTART);
@ -591,6 +601,7 @@ fu_ebitdo_device_class_init (FuEbitdoDeviceClass *klass)
FuUsbDeviceClass *klass_usb_device = FU_USB_DEVICE_CLASS (klass); FuUsbDeviceClass *klass_usb_device = FU_USB_DEVICE_CLASS (klass);
klass_device->write_firmware = fu_ebitdo_device_write_firmware; klass_device->write_firmware = fu_ebitdo_device_write_firmware;
klass_device->setup = fu_ebitdo_device_setup; klass_device->setup = fu_ebitdo_device_setup;
klass_device->attach = fu_ebitdo_device_attach;
klass_usb_device->open = fu_ebitdo_device_open; klass_usb_device->open = fu_ebitdo_device_open;
klass_usb_device->probe = fu_ebitdo_device_probe; klass_usb_device->probe = fu_ebitdo_device_probe;
klass_device->prepare_firmware = fu_ebitdo_device_prepare_firmware; klass_device->prepare_firmware = fu_ebitdo_device_prepare_firmware;

5
src/fu-engine.c
View File

@ -2259,11 +2259,6 @@ fu_engine_update_attach (FuEngine *self, const gchar *device_id, GError **error)
if (plugin == NULL) if (plugin == NULL)
return FALSE; return FALSE;
if (fu_device_has_flag (device, FWUPD_DEVICE_FLAG_WILL_DISAPPEAR)) {
g_debug ("skipping attach due to will-disappear flag");
return TRUE;
}
if (!fu_plugin_runner_update_attach (plugin, device, error)) if (!fu_plugin_runner_update_attach (plugin, device, error))
return FALSE; return FALSE;
return TRUE; return TRUE;