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

modem-manager: Only try to get the branch if there exists an AT port

Browse Source 
Fixes https://github.com/fwupd/fwupd/issues/4190
This commit is contained in:
Richard Hughes 2022-01-19 16:50:22 +00:00
parent 4329ddbd76
commit 0264c29bda
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/modem-manager/fu-mm-device.c
View File

@ -1565,28 +1565,39 @@ fu_mm_device_attach(FuDevice *device, FuProgress *progress, GError **error)
} }
static gboolean static gboolean
fu_mm_device_setup(FuDevice *device, GError **error) fu_mm_device_setup_branch_at(FuMmDevice *self, GError **error)
{ {
FuMmDevice *self = FU_MM_DEVICE(device);
g_autoptr(FuDeviceLocker) locker = NULL; g_autoptr(FuDeviceLocker) locker = NULL;
/* Create IO channel to send AT commands to the modem */ /* Create IO channel to send AT commands to the modem */
locker = fu_device_locker_new_full(device, locker = fu_device_locker_new_full(self,
(FuDeviceLockerFunc)fu_mm_device_io_open, (FuDeviceLockerFunc)fu_mm_device_io_open,
(FuDeviceLockerFunc)fu_mm_device_io_close, (FuDeviceLockerFunc)fu_mm_device_io_close,
error); error);
if (locker == NULL) if (locker == NULL)
return FALSE; return FALSE;
/*
* firmware branch AT command may fail if not implemented, /* firmware branch AT command may fail if not implemented,
* clear error if not supported * clear error if not supported */
*/
if (self->branch_at != NULL) { if (self->branch_at != NULL) {
g_autoptr(GError) error_branch = NULL; g_autoptr(GError) error_branch = NULL;
if (!fu_mm_device_at_cmd(self, self->branch_at, TRUE, &error_branch)) if (!fu_mm_device_at_cmd(self, self->branch_at, TRUE, &error_branch))
g_debug("unable to get firmware branch: %s", error_branch->message); g_debug("unable to get firmware branch: %s", error_branch->message);
} }
/* success */
return TRUE;
}
static gboolean
fu_mm_device_setup(FuDevice *device, GError **error)
{
FuMmDevice *self = FU_MM_DEVICE(device);
if (self->port_at != NULL) {
if (!fu_mm_device_setup_branch_at(self, error))
return FALSE;
}
if (fu_device_get_branch(device) != NULL) if (fu_device_get_branch(device) != NULL)
g_debug("using firmware branch: %s", fu_device_get_branch(device)); g_debug("using firmware branch: %s", fu_device_get_branch(device));
else else