diff --git a/[refs] b/[refs]
index 38c086b6b1a7..ef11a0ceee55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7b11d738282337488ae158c975d76271ad43a98
+refs/heads/master: 502664eeaf880d364821521bbced7ae342f77f64
diff --git a/trunk/net/irda/irnetlink.c b/trunk/net/irda/irnetlink.c
index 82c6118d82c6..8dd7ed7e7c1f 100644
--- a/trunk/net/irda/irnetlink.c
+++ b/trunk/net/irda/irnetlink.c
@@ -148,21 +148,8 @@ static struct genl_ops irda_nl_ops[] = {
 
 int irda_nl_register(void)
 {
-	int err, i;
-
-	err = genl_register_family(&irda_nl_family);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(irda_nl_ops); i++) {
-		err = genl_register_ops(&irda_nl_family, &irda_nl_ops[i]);
-		if (err)
-			goto err_out;
-	}
-	return 0;
- err_out:
-	genl_unregister_family(&irda_nl_family);
-	return err;
+	return genl_register_family_with_ops(&irda_nl_family,
+		irda_nl_ops, ARRAY_SIZE(irda_nl_ops));
 }
 
 void irda_nl_unregister(void)