colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-manager: remove MMDevice if support check fails

Browse Source 
If the device support check fails, either with an error, or afterwards
when trying to create a modem object, we must remove the MMDevice from
the tracking table of devices, so that a manual scan request
afterwards re-scans all ports.

https://bugs.freedesktop.org/show_bug.cgi?id=100157
This commit is contained in:
Aleksander Morgado
2017-03-06 15:01:21 +01:00
parent 355633f8d6
commit e9d0989ed0
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mm-base-manager.c
View File

@@ -160,12 +160,18 @@ device_support_check_ready (MMPluginManager *plugin_manager,
GError *error = NULL; GError *error = NULL;
MMPlugin *plugin; MMPlugin *plugin;
/* If the device support check fails, either with an error, or afterwards
* when trying to create a modem object, we must remove the MMDevice from
* the tracking table of devices, so that a manual scan request afterwards
* re-scans all ports. */
/* Receive plugin result from the plugin manager */ /* Receive plugin result from the plugin manager */
plugin = mm_plugin_manager_device_support_check_finish (plugin_manager, res, &error); plugin = mm_plugin_manager_device_support_check_finish (plugin_manager, res, &error);
if (!plugin) { if (!plugin) {
mm_info ("Couldn't check support for device '%s': %s", mm_info ("Couldn't check support for device '%s': %s",
mm_device_get_uid (ctx->device), error->message); mm_device_get_uid (ctx->device), error->message);
g_error_free (error); g_error_free (error);
g_hash_table_remove (ctx->self->priv->devices, mm_device_get_uid (ctx->device));
find_device_support_context_free (ctx); find_device_support_context_free (ctx);
return; return;
} }
@@ -178,6 +184,7 @@ device_support_check_ready (MMPluginManager *plugin_manager,
mm_warn ("Couldn't create modem for device '%s': %s", mm_warn ("Couldn't create modem for device '%s': %s",
mm_device_get_uid (ctx->device), error->message); mm_device_get_uid (ctx->device), error->message);
g_error_free (error); g_error_free (error);
g_hash_table_remove (ctx->self->priv->devices, mm_device_get_uid (ctx->device));
find_device_support_context_free (ctx); find_device_support_context_free (ctx);
return; return;
} }