* [PATCH] input synaptics-rmi4: Correctly configure RMI4 functions during initialization
@ 2014-03-19 0:21 Christopher Heiny
0 siblings, 0 replies; only message in thread
From: Christopher Heiny @ 2014-03-19 0:21 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linux Input, Christopher Heiny, Andrew Duggan, Vincent Huang,
Vivian Ly, Daniel Rosenberg, Linus Walleij, Benjamin Tissoires,
David Herrmann, Jiri Kosina, Courtney Cavin
Fix a bug where an RMI4 function handler's config() routine
was not be called during rmi_function_probe().
Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: Linux Walleij <linus.walleij@linaro.org>
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Courtney Cavin <courtney.cavin@sonymobile.com>
---
drivers/input/rmi4/rmi_bus.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index 6e0454a..2ed0d32 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -212,7 +212,14 @@ static int rmi_function_probe(struct device *dev)
if (handler->probe) {
error = handler->probe(fn);
- return error;
+ if (error)
+ return error;
+ }
+ if (handler->config) {
+ error = handler->config(fn);
+ if (error)
+ dev_warn(dev, "WARNING: Config for F%02x failed with code %d.\n",
+ handler->func, error);
}
return 0;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-19 0:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-19 0:21 [PATCH] input synaptics-rmi4: Correctly configure RMI4 functions during initialization Christopher Heiny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).