From 0931f8bc4c4d290fde4d7d396f3f45f192bcf5ad Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 28 Aug 2012 19:30:44 +0800
Subject: [PATCH] --- yaml --- r: 322486 b: refs/heads/master c:
 dd2914972e5f6d9c1a687158c0f65b81d239fe37 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/gpio/gpio-em.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8907dfc367c0..5e5c03f749bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c30aa33d4b4ce9a0ee5b32d058a40f4eca2ab63
+refs/heads/master: dd2914972e5f6d9c1a687158c0f65b81d239fe37
diff --git a/trunk/drivers/gpio/gpio-em.c b/trunk/drivers/gpio/gpio-em.c
index ae37181798b3..ec48ed512628 100644
--- a/trunk/drivers/gpio/gpio-em.c
+++ b/trunk/drivers/gpio/gpio-em.c
@@ -247,9 +247,9 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p)
 
 	p->irq_base = irq_alloc_descs(pdata->irq_base, 0,
 				      pdata->number_of_pins, numa_node_id());
-	if (IS_ERR_VALUE(p->irq_base)) {
+	if (p->irq_base < 0) {
 		dev_err(&pdev->dev, "cannot get irq_desc\n");
-		return -ENXIO;
+		return p->irq_base;
 	}
 	pr_debug("gio: hw base = %d, nr = %d, sw base = %d\n",
 		 pdata->gpio_base, pdata->number_of_pins, p->irq_base);