summaryrefslogtreecommitdiffstats
path: root/drivers/atmodem/network-registration.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-08-16 22:02:01 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-08-16 22:02:01 +0200
commita8d3e7433a5485867041a401a4e10604a587dd70 (patch)
tree6ef7c14085728f0e705d0b4c27728c867bcd8a5e /drivers/atmodem/network-registration.c
parent54c75c47f8df356361a1ecab121d4516652f6dfe (diff)
downloadofono-a8d3e7433a5485867041a401a4e10604a587dd70.tar.bz2
atmodem: Remove useless NULL checks before g_free
Diffstat (limited to 'drivers/atmodem/network-registration.c')
-rw-r--r--drivers/atmodem/network-registration.c21
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index 66cf29cb..d4329a3d 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -220,8 +220,7 @@ static void at_registration_status(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
}
@@ -365,8 +364,7 @@ static void at_current_operator(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, NULL, data);
}
@@ -486,8 +484,7 @@ static void at_list_operators(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, 0, NULL, data);
}
@@ -517,8 +514,7 @@ static void at_register_auto(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}
@@ -541,8 +537,7 @@ static void at_register_manual(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}
@@ -561,8 +556,7 @@ static void at_deregister(struct ofono_netreg *netreg,
return;
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}
@@ -758,8 +752,7 @@ static void at_signal_strength(struct ofono_netreg *netreg,
}
error:
- if (cbd)
- g_free(cbd);
+ g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, data);
}