From 38c9077b8f115d3440174d3232c1c2db65391f11 Mon Sep 17 00:00:00 2001 From: Gabriel Fernandez Date: Fri, 1 Mar 2013 13:07:16 +0100 Subject: [PATCH] --- yaml --- r: 373173 b: refs/heads/master c: a200e320f7ba7daa42e5fae3a1c67ed2f704b05c h: refs/heads/master i: 373171: f0d49ac60c3182687a7f279f910513c11db055e1 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/stmpe.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6c586f235d61..c4731915c739 100644 --- 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 index 4b11202061be..e550dcb1d394 100644 --- 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);