From 50de6798b0ae86692ad1f9a7b3e3188f16d2e45a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 13 Feb 2014 15:55:35 -0600 Subject: broadband-modem: fix double-free of QCDM mode-pref query Caused by a merge conflict between 81ee0783 and 529e94b0. --- src/mm-broadband-modem.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 6a32128c..c9b438af 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -613,12 +613,9 @@ mode_pref_qcdm_ready (MMPortSerialQcdm *port, qcdm_result_unref (result); if (err) { mm_dbg ("Failed to read NV ModePref: %d", err); - qcdm_result_unref (result); goto at_caps; } - qcdm_result_unref (result); - /* Only parse explicit modes; for 'auto' just fall back to whatever * the AT current capabilities probing figures out. */ -- cgit v1.2.3