diff --git a/[refs] b/[refs]
index b5ec93356311..e588d1d4ee3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cad6a8a4c31175578943f087e1dbef9f52e6ec3
+refs/heads/master: 1631081993b1e6a6d668b3eb089904b88f0efc2b
diff --git a/trunk/drivers/gpio/gpio-em.c b/trunk/drivers/gpio/gpio-em.c
index 88bdfe37816f..b00706329d26 100644
--- a/trunk/drivers/gpio/gpio-em.c
+++ b/trunk/drivers/gpio/gpio-em.c
@@ -302,8 +302,8 @@ static int __devinit em_gio_probe(struct platform_device *pdev)
 	p->irq_domain = irq_domain_add_linear(pdev->dev.of_node,
 					      pdata->number_of_pins,
 					      &em_gio_irq_domain_ops, p);
-	if (!p->irq_domain)
-		err = -ENXIO;
+	if (!p->irq_domain) {
+		ret = -ENXIO;
 		dev_err(&pdev->dev, "cannot initialize irq domain\n");
 		goto err3;
 	}
@@ -358,7 +358,7 @@ static int __devexit em_gio_remove(struct platform_device *pdev)
 
 	free_irq(irq[1]->start, pdev);
 	free_irq(irq[0]->start, pdev);
-	em_gio_irq_domain_cleanup(p);
+	irq_domain_remove(p->irq_domain);
 	iounmap(p->base1);
 	iounmap(p->base0);
 	kfree(p);