summaryrefslogtreecommitdiffstats
path: root/drivers/calypsomodem
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2009-09-11 12:36:35 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-09-11 12:39:56 -0500
commitcbb36acee848bdbfb3480bde3ae6d9ac79137e69 (patch)
treedde7f149bba50581f0a8ff85fc6fd9529320ce5e /drivers/calypsomodem
parent32fc30fa02a6d46b78f45e446b2347754ba2136a (diff)
downloadofono-cbb36acee848bdbfb3480bde3ae6d9ac79137e69.tar.bz2
Rework DECLARE_FAILURE to be a bit nicer
Diffstat (limited to 'drivers/calypsomodem')
-rw-r--r--drivers/calypsomodem/voicecall.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c
index 1eaeb79c..abfa021b 100644
--- a/drivers/calypsomodem/voicecall.c
+++ b/drivers/calypsomodem/voicecall.c
@@ -75,10 +75,7 @@ error:
if (cbd)
g_free(cbd);
- {
- DECLARE_FAILURE(error);
- cb(&error, data);
- }
+ CALLBACK_WITH_FAILURE(cb, data);
}
static void calypso_dial(struct ofono_voicecall *vc,
@@ -206,8 +203,7 @@ static void calypso_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
buf = g_try_new(char, len * 9 + 3);
if (!buf) {
- DECLARE_FAILURE(error);
- cb(&error, data);
+ CALLBACK_WITH_FAILURE(cb, data);
return;
}