3 files changed, 18 insertions, 8 deletions

diff --git a/drivers/atmodem/atmodem.c b/drivers/atmodem/atmodem.c
index 944fd97a..df32517c 100644
--- a/drivers/atmodem/atmodem.c
+++ b/drivers/atmodem/atmodem.c
@@ -48,18 +48,18 @@ DBusMessage *__ofono_error_invalid_format(DBusMessage *msg);
 DBusMessage *__ofono_error_failed(DBusMessage *msg);
 DBusMessage *__ofono_error_not_found(DBusMessage *msg);
 
-static void modem_list(char ***modems)
+static void modem_list(const char ***modems)
 {
 	GSList *l;
 	int i;
 	struct at_data *at;
 
-	*modems = g_new0(char *, g_slist_length(g_sessions) + 1);
+	*modems = g_new0(const char *, g_slist_length(g_sessions) + 1);
 
 	for (l = g_sessions, i = 0; l; l = l->next, i++) {
 		at = l->data;
 
-		(*modems)[i] = at->modem->path;
+		(*modems)[i] = ofono_modem_get_path(at->modem);
 	}
 }
 
@@ -328,7 +328,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user)
 	struct at_data *at = NULL;
 	const char *path;
 	const char *target, *driver;
-	char **modems;
+	const char **modems;
 
 	g_pending = g_slist_remove(g_pending, io);
 
@@ -373,7 +373,7 @@ static void create_cb(GIOChannel *io, gboolean success, gpointer user)
 	g_pending = g_slist_remove(g_pending, io);
 	g_sessions = g_slist_prepend(g_sessions, at);
 
-	path = at->modem->path;
+	path = ofono_modem_get_path(at->modem);
 
 	reply = dbus_message_new_method_return(msg);
 
@@ -436,9 +436,9 @@ static DBusMessage *manager_destroy(DBusConnection *conn, DBusMessage *msg,
 
 	for (l = g_sessions; l; l = l->next) {
 		struct at_data *at = l->data;
-		char **modems;
+		const char **modems;
 
-		if (strcmp(at->modem->path, path))
+		if (strcmp(ofono_modem_get_path(at->modem), path))
 			continue;
 
 		interface_exit(at);
@@ -466,7 +466,7 @@ static DBusMessage *manager_get_properties(DBusConnection *conn,
 	DBusMessageIter iter;
 	DBusMessageIter dict;
 	DBusMessage *reply;
-	char **modems;
+	const char **modems;
 
 	reply = dbus_message_new_method_return(msg);
 
diff --git a/include/modem.h b/include/modem.h
index 047c1b46..a467da27 100644
--- a/include/modem.h
+++ b/include/modem.h
@@ -32,6 +32,8 @@ void ofono_modem_add_interface(struct ofono_modem *modem,
 void ofono_modem_remove_interface(struct ofono_modem *modem,
 					const char *interface);
 
+const char *ofono_modem_get_path(struct ofono_modem *modem);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/modem.c b/src/modem.c
index bcb3a7d3..904636fc 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -93,6 +93,14 @@ void *ofono_modem_userdata(struct ofono_modem *modem)
 	return NULL;
 }
 
+const char *ofono_modem_get_path(struct ofono_modem *modem)
+{
+	if (modem)
+		return modem->path;
+
+	return NULL;
+}
+
 static void modem_free(gpointer data)
 {
 	struct ofono_modem *modem = data;