summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
Diffstat (limited to 'input')
-rw-r--r--input/device.c4
-rw-r--r--input/server.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/input/device.c b/input/device.c
index eb089093..4ab7aabc 100644
--- a/input/device.c
+++ b/input/device.c
@@ -741,7 +741,7 @@ static void control_connect_cb(GIOChannel *chan, GError *conn_err,
error("%s", err->message);
reply = connection_attempt_failed(iconn->pending_connect,
err->message);
- g_clear_error(&err);
+ g_error_free(err);
g_io_channel_close(chan);
goto failed;
}
@@ -939,7 +939,7 @@ static DBusMessage *device_connect(DBusConnection *conn,
dbus_message_unref(iconn->pending_connect);
iconn->pending_connect = NULL;
reply = connection_attempt_failed(msg, err->message);
- g_clear_error(&err);
+ g_error_free(err);
return reply;
}
diff --git a/input/server.c b/input/server.c
index fdeac6d5..88db485c 100644
--- a/input/server.c
+++ b/input/server.c
@@ -142,7 +142,7 @@ int server_start(const bdaddr_t *src)
BT_IO_OPT_INVALID);
if (!ctrl_io) {
error("Failed to listen on control channel");
- g_clear_error(&err);
+ g_error_free(err);
return -1;
}
@@ -154,7 +154,7 @@ int server_start(const bdaddr_t *src)
if (!intr_io) {
error("Failed to listen on interrupt channel");
g_io_channel_unref(ctrl_io);
- g_clear_error(&err);
+ g_error_free(err);
return -1;
}