summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2016-12-08 22:19:49 +0100
committerAleksander Morgado <aleksander@aleksander.es>2017-01-16 11:24:15 +0100
commit0f040ac69fa6c14ab467b3971b55ab5320812132 (patch)
treede3dbd152b2a4d9e78b0933db7b6b0bdb143c3ee
parenta75c346df29832fcb07fe9de3222cfe335536c55 (diff)
downloadlibqmi-0f040ac69fa6c14ab467b3971b55ab5320812132.tar.gz
qmi-firmware-update: ignore QMI release/close errors
Because the module may already be power cycling itself.
-rw-r--r--src/qmi-firmware-update/qfu-updater.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/qmi-firmware-update/qfu-updater.c b/src/qmi-firmware-update/qfu-updater.c
index 08be691f..b5af7986 100644
--- a/src/qmi-firmware-update/qfu-updater.c
+++ b/src/qmi-firmware-update/qfu-updater.c
@@ -449,22 +449,16 @@ qmi_client_release_ready (QmiDevice *device,
ctx = (RunContext *) g_task_get_task_data (task);
if (!qmi_device_release_client_finish (device, res, &error)) {
- g_prefix_error (&error, "couldn't release DMS QMI client: ");
- g_task_return_error (task, error);
- g_object_unref (task);
- return;
- }
-
- g_debug ("[qfu-updater] DMS QMI client released");
+ g_debug ("[qfu-updater] error (ignored): couldn't release DMS QMI client: %s", error->message);
+ g_clear_error (&error);
+ } else
+ g_debug ("[qfu-updater] DMS QMI client released");
if (!qmi_device_close (ctx->qmi_device, &error)) {
- g_prefix_error (&error, "couldn't close QMI device: ");
- g_task_return_error (task, error);
- g_object_unref (task);
- return;
- }
-
- g_debug ("[qfu-updater] QMI device closed");
+ g_debug ("[qfu-updater] error (ignored): couldn't close QMI device: %s", error->message);
+ g_clear_error (&error);
+ } else
+ g_debug ("[qfu-updater] QMI device closed");
g_clear_object (&ctx->qmi_device);
g_clear_object (&ctx->cdc_wdm_file);