Fix: Fail if no driver or id range set

1 files changed, 5 insertions, 4 deletions

diff --git a/src/gprs.c b/src/gprs.c
index a80c2d62..58f4a4a6 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -650,6 +650,11 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
 	if (g_str_equal(property, "Active")) {
 		struct ofono_gprs_context *gc = ctx->gprs->context_driver;
 
+		if (gc == NULL || gc->driver->activate_primary == NULL ||
+				gc->driver->deactivate_primary == NULL ||
+				ctx->gprs->cid_map == NULL)
+			return __ofono_error_not_implemented(msg);
+
 		if (gc->pending)
 			return __ofono_error_busy(msg);
 
@@ -667,10 +672,6 @@ static DBusMessage *pri_set_property(DBusConnection *conn,
 		if (ctx->gprs->flags & GPRS_FLAG_ATTACHING)
 			return __ofono_error_attach_in_progress(msg);
 
-		if (gc == NULL || gc->driver->activate_primary == NULL ||
-				gc->driver->deactivate_primary == NULL)
-			return __ofono_error_not_implemented(msg);
-
 		if (value) {
 			ctx->context.cid = gprs_cid_alloc(ctx->gprs);