From 5b8f052524ff092ebe111303f716314fa62d8462 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Tue, 3 Jul 2018 16:13:39 -0500 Subject: [PATCH] device: Don't return an error on no state change If device is already disconnected or in autoconnect mode, don't return an error if .Disconnect is called. Instead simply silently return success after disabling autoconnect. --- src/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/device.c b/src/device.c index e3b75185..a8bdcd1a 100644 --- a/src/device.c +++ b/src/device.c @@ -1883,6 +1883,10 @@ static struct l_dbus_message *device_dbus_disconnect(struct l_dbus *dbus, */ device_set_autoconnect(device, false); + if (device->state == DEVICE_STATE_AUTOCONNECT || + device->state == DEVICE_STATE_DISCONNECTED) + return l_dbus_message_new_method_return(message); + result = device_disconnect(device); if (result < 0) return dbus_error_from_errno(result, message);