From 73e152af6e3fb4f5848bfb8394484026ff119003 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 May 2016 17:08:25 +0200 Subject: Imported Upstream version 1.2.2 --- src/settings/plugins/ifnet/connection_parser.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/settings/plugins/ifnet') diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index d9ff97dc..80b82535 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -1541,15 +1541,12 @@ make_wireless_security_setting (const char *conn_name, if (wsec == NULL) goto error; } - - if (!wsec) { - g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, - "Can't handle security information for ssid: %s", - conn_name); - } - return wsec; + error: + g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, + "Can't handle security information for ssid: %s", + conn_name); return NULL; } -- cgit 1.3.0-6-gf8a5