diff options
author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
commit | 17370895fde2d210bb50dfaa1c89fe6601de3467 (patch) | |
tree | 2797d5e061b7948a53f270f9ccfcc31b1c0ad6f5 /serial/main.c | |
parent | fa141e676e82cd20082779c086d1fef6427fdc20 (diff) | |
parent | 393416b170d6e4b2b7406418d63c7be2aefda70f (diff) |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'serial/main.c')
-rw-r--r-- | serial/main.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/serial/main.c b/serial/main.c index 97b26925..39df1650 100644 --- a/serial/main.c +++ b/serial/main.c @@ -26,24 +26,24 @@ #endif #include <errno.h> -#include <sys/types.h> #include <gdbus.h> #include "plugin.h" -#include "logging.h" #include "manager.h" +static DBusConnection *connection; + static int serial_init(void) { - DBusConnection *conn; - - conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - if (conn == NULL) + connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + if (connection == NULL) return -EIO; - if (serial_manager_init(conn) < 0) + if (serial_manager_init(connection) < 0) { + dbus_connection_unref(connection); return -EIO; + } return 0; } @@ -51,6 +51,8 @@ static int serial_init(void) static void serial_exit(void) { serial_manager_exit(); + + dbus_connection_unref(connection); } BLUETOOTH_PLUGIN_DEFINE("serial", serial_init, serial_exit) |