From d239258e8d759514af2d390a332661c2d1888ac3 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 9 Oct 2012 04:59:54 -0300 Subject: [PATCH] adapter: Fix calling mgmt_set_pairable() with error set --- src/adapter.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 26016f6b0..a6593b2cf 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -415,8 +415,12 @@ static DBusMessage *set_pairable(DBusMessage *msg, goto store; err = set_mode(adapter, MODE_DISCOVERABLE); - if (err < 0 && msg) - return btd_error_failed(msg, strerror(-err)); + if (err < 0) { + if (msg != NULL) + return btd_error_failed(msg, strerror(-err)); + + return NULL; + } store: mgmt_set_pairable(adapter->dev_id, pairable); -- 2.47.3