---

yaml --- r: 373174 b: refs/heads/master c: 408a3fa h: refs/heads/master v: v3
git-mirror · Apr 5, 2013 · 1e1b743 · 1e1b743
1 parent 38c9077
commit 1e1b743
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a200e320f7ba7daa42e5fae3a1c67ed2f704b05c
+refs/heads/master: 408a3fa867be13844af13bcbba25e70232fd99e5
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
@@ -1015,7 +1015,10 @@ void stmpe_of_probe(struct stmpe_platform_data *pdata, struct device_node *np)
 {
 	struct device_node *child;
 
-	pdata->id = -1;
+	pdata->id = of_alias_get_id(np, "stmpe-i2c");
+	if (pdata->id < 0)
+		pdata->id = -1;
+
 	pdata->irq_trigger = IRQF_TRIGGER_NONE;
 
 	of_property_read_u32(np, "st,autosleep-timeout",