---

yaml --- r: 373173 b: refs/heads/master c: a200e32 h: refs/heads/master i: 373171: f0d49ac v: v3
git-mirror · Apr 5, 2013 · 38c9077 · 38c9077
1 parent d8a263f
commit 38c9077
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ab3a89a741fa4c331f42dec17fde59586dc59e6
+refs/heads/master: a200e320f7ba7daa42e5fae3a1c67ed2f704b05c
diff --git a/trunk/drivers/mfd/stmpe.c b/trunk/drivers/mfd/stmpe.c
@@ -1057,6 +1057,9 @@ int stmpe_probe(struct stmpe_client_info *ci, int partnum)
 			return -ENOMEM;
 
 		stmpe_of_probe(pdata, np);
+
+		if (of_find_property(np, "interrupts", NULL) == NULL)
+			ci->irq = -1;
 	}
 
 	stmpe = devm_kzalloc(ci->dev, sizeof(struct stmpe), GFP_KERNEL);