proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 12:54:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: dell-dock: check for valid dock type on open

Browse Source 
Only add instance ID if it actually probes properly.

Otherwise this makes an invalid assumption that the device is a WD19
EC just because it had the correct hub in front.

Instead check the first time it's opened that the correct device
is identified (`EXPECTED_DOCK_TYPE`)
This commit is contained in:
Mario Limonciello 2020-08-27 21:00:48 -05:00 committed by Mario Limonciello
parent f9902f1cdd
commit e89ce1a935
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/dell-dock/fu-dell-dock-i2c-ec.c
View File

@ -301,8 +301,9 @@ fu_dell_dock_ec_write (FuDevice *device, gsize length, guint8 *data, GError **er
static gboolean static gboolean
fu_dell_dock_is_valid_dock (FuDevice *device, GError **error) fu_dell_dock_is_valid_dock (FuDevice *device, GError **error)
{ {
g_autoptr(GBytes) data = NULL;
const guint8 *result = NULL; const guint8 *result = NULL;
gsize sz = 0;
g_autoptr(GBytes) data = NULL;
g_return_val_if_fail (device != NULL, FALSE); g_return_val_if_fail (device != NULL, FALSE);
@ -310,16 +311,27 @@ fu_dell_dock_is_valid_dock (FuDevice *device, GError **error)
g_prefix_error (error, "Failed to query dock type: "); g_prefix_error (error, "Failed to query dock type: ");
return FALSE; return FALSE;
} }
result = g_bytes_get_data (data, NULL); result = g_bytes_get_data (data, &sz);
if (sz != 1) {
if (result == NULL || *result != EXPECTED_DOCK_TYPE) { g_set_error_literal (error, FWUPD_ERROR, FWUPD_ERROR_NOT_SUPPORTED,
g_set_error_literal (error, FWUPD_ERROR, FWUPD_ERROR_NOT_FOUND,
"No valid dock was found"); "No valid dock was found");
return FALSE; return FALSE;
} }
/* this will trigger setting up all the quirks */
if (result[0] == EXPECTED_DOCK_TYPE) {
fu_device_add_instance_id (device, DELL_DOCK_EC_INSTANCE_ID);
return TRUE; return TRUE;
} }
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED,
"Invalid dock type: %x",
*result);
return FALSE;
}
static gboolean static gboolean
fu_dell_dock_ec_get_dock_info (FuDevice *device, fu_dell_dock_ec_get_dock_info (FuDevice *device,
GError **error) GError **error)
@ -919,15 +931,6 @@ fu_dell_dock_ec_set_quirk_kv (FuDevice *device,
return FALSE; return FALSE;
} }
static gboolean
fu_dell_dock_ec_probe (FuDevice *device, GError **error)
{
/* this will trigger setting up all the quirks */
fu_device_add_instance_id (device, DELL_DOCK_EC_INSTANCE_ID);
return TRUE;
}
static gboolean static gboolean
fu_dell_dock_ec_query (FuDevice *device, GError **error) fu_dell_dock_ec_query (FuDevice *device, GError **error)
{ {
@ -976,10 +979,13 @@ fu_dell_dock_ec_setup (FuDevice *device, GError **error)
static gboolean static gboolean
fu_dell_dock_ec_open (FuDevice *device, GError **error) fu_dell_dock_ec_open (FuDevice *device, GError **error)
{ {
FuDellDockEc *self = FU_DELL_DOCK_EC (device);
if (!fu_device_open (fu_device_get_proxy (device), error)) if (!fu_device_open (fu_device_get_proxy (device), error))
return FALSE; return FALSE;
if (!self->data->dock_type)
return fu_dell_dock_is_valid_dock (device, error); return fu_dell_dock_is_valid_dock (device, error);
return TRUE;
} }
static gboolean static gboolean
@ -1017,7 +1023,6 @@ fu_dell_dock_ec_class_init (FuDellDockEcClass *klass)
object_class->finalize = fu_dell_dock_ec_finalize; object_class->finalize = fu_dell_dock_ec_finalize;
klass_device->activate = fu_dell_dock_ec_activate; klass_device->activate = fu_dell_dock_ec_activate;
klass_device->to_string = fu_dell_dock_ec_to_string; klass_device->to_string = fu_dell_dock_ec_to_string;
klass_device->probe = fu_dell_dock_ec_probe;
klass_device->setup = fu_dell_dock_ec_setup; klass_device->setup = fu_dell_dock_ec_setup;
klass_device->open = fu_dell_dock_ec_open; klass_device->open = fu_dell_dock_ec_open;
klass_device->close = fu_dell_dock_ec_close; klass_device->close = fu_dell_dock_ec_close;