about summary refs log tree commit diff
path: root/src/devices/bluetooth
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-05-11 17:09:14 +0200
committerMichael Biebl <biebl@debian.org>2016-05-11 17:09:14 +0200
commitc74718aa5a356199a1ff957b2579153d54be9dd5 (patch)
treecf3ade8c1e7322792ec140f09ee5e083382c5c48 /src/devices/bluetooth
parent6bb523977deede318916fe01c78f776d215cebff (diff)
parent73e152af6e3fb4f5848bfb8394484026ff119003 (diff)
Merge tag 'upstream/1.2.2'
Upstream version 1.2.2
Diffstat (limited to 'src/devices/bluetooth')
-rw-r--r--src/devices/bluetooth/nm-bluez-device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index a009746d..5ee22f93 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -788,7 +788,7 @@ static void
 adapter5_on_acquired (GObject *object, GAsyncResult *res, NMBluezDevice *self)
 {
 	NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
-	GError *error;
+	GError *error = NULL;
 	GVariant *v;
 
 	priv->adapter5 = g_dbus_proxy_new_for_bus_finish (res, &error);