From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 7 Oct 2008 22:38:45 +0000 (+0200)
Subject: Fix checking for existing driver and callbacks
X-Git-Tag: 0.1~171
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4477991e23838c49eb59f94230ce5ac3858dffa;p=platform%2Fupstream%2Fconnman.git

Fix checking for existing driver and callbacks
---

diff --git a/src/element.c b/src/element.c
index d2fe4bc..5b2ecbc 100644
--- a/src/element.c
+++ b/src/element.c
@@ -356,13 +356,10 @@ static DBusMessage *do_update(DBusConnection *conn,
 
 	DBG("conn %p", conn);
 
-	if (element->driver == NULL)
-		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
 	if (element->enabled == FALSE)
 		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 
-	if (element->driver->update) {
+	if (element->driver && element->driver->update) {
 		DBG("Calling update callback");
 		element->driver->update(element);
 	}
@@ -377,13 +374,10 @@ static DBusMessage *do_enable(DBusConnection *conn,
 
 	DBG("conn %p", conn);
 
-	if (element->driver == NULL)
-		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-
 	if (element->enabled == TRUE)
 		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 
-	if (element->driver->enable) {
+	if (element->driver && element->driver->enable) {
 		DBG("Calling enable callback");
 		element->driver->enable(element);
 	}