summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2014-10-14 15:32:21 -0500
committerDan Williams <dcbw@redhat.com>2014-12-11 10:04:35 -0600
commit9cc7ac1d4471aedba2ab8d13e109cad917000d18 (patch)
tree0804a8638aebcf0370a43946fe1993f4b9e1b459
parenta0ca4b7ceb75c3e077dfd045f9ff49f33051131f (diff)
downloadNetworkManager-9cc7ac1d4471aedba2ab8d13e109cad917000d18.tar.gz
fixup! core: split device creation and device setup
-rw-r--r--src/devices/nm-device-factory.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 07e5b59dd2..b5b26f6bd4 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -87,8 +87,7 @@ nm_device_factory_create_device (NMDeviceFactory *factory,
g_return_val_if_fail (factory, NULL);
g_return_val_if_fail (iface, NULL);
g_return_val_if_fail (plink || connection, NULL);
- if (plink)
- g_return_val_if_fail (strcmp (iface, plink->name) == 0, NULL);
+ g_return_val_if_fail (!plink || strcmp (iface, plink->name) == 0, NULL);
if (NM_DEVICE_FACTORY_GET_INTERFACE (factory)->create_device)
return NM_DEVICE_FACTORY_GET_INTERFACE (factory)->create_device (factory, iface, plink, connection);