---

yaml --- r: 321556 b: refs/heads/master c: 7e6086d h: refs/heads/master v: v3
git-mirror · Aug 7, 2012 · 6a63af1 · 6a63af1
1 parent eb807b1
commit 6a63af1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6b0ca25ee402f714487b31c35f8e11f2bf4310b
+refs/heads/master: 7e6086d9e54a159a6257c02bb7fc5805c614aad2
diff --git a/trunk/drivers/gpio/gpio-mxc.c b/trunk/drivers/gpio/gpio-mxc.c
@@ -465,7 +465,8 @@ static int __devinit mxc_gpio_probe(struct platform_device *pdev)
 		goto out_iounmap;
 
 	port->bgc.gc.to_irq = mxc_gpio_to_irq;
-	port->bgc.gc.base = pdev->id * 32;
+	port->bgc.gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :
+					     pdev->id * 32;
 
 	err = gpiochip_add(&port->bgc.gc);
 	if (err)