From dbb4597e335d66dda7abebbab7d70b0708146350 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 20 Oct 2017 17:46:40 +0200 Subject: broadband-modem-qmi: avoid NULL success return in firmware_load_list Instead of assuming that NULL is a valid return, make sure we return an error instead. --- src/mm-iface-modem-firmware.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/mm-iface-modem-firmware.c') diff --git a/src/mm-iface-modem-firmware.c b/src/mm-iface-modem-firmware.c index f87a7bf1..da106b00 100644 --- a/src/mm-iface-modem-firmware.c +++ b/src/mm-iface-modem-firmware.c @@ -99,10 +99,15 @@ load_list_ready (MMIfaceModemFirmware *self, GError *error = NULL; ctx->list = MM_IFACE_MODEM_FIRMWARE_GET_INTERFACE (self)->load_list_finish (self, res, &error); - if (error) { - g_dbus_method_invocation_take_error (ctx->invocation, error); - handle_list_context_free (ctx); - return; + if (!ctx->list) { + /* Not found isn't fatal */ + if (!g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_NOT_FOUND)) { + g_dbus_method_invocation_take_error (ctx->invocation, error); + handle_list_context_free (ctx); + return; + } + mm_dbg ("Couldn't load firmware image list: %s", error->message); + g_clear_error (&error); } MM_IFACE_MODEM_FIRMWARE_GET_INTERFACE (self)->load_current (MM_IFACE_MODEM_FIRMWARE (self), -- cgit v1.2.3-70-g09d2