input synaptics-rmi4: Correctly configure RMI4 functions during initialization

PATCH New Christopher Heiny 1 participant 1 message Mar 19, 2014

Subsystems (2)

HID Input drivers

lore

Share & tools

lore

Christopher Heiny

author

2014-03-19 00:21 UTC #0 lore raw

PATCH 1/1 input synaptics-rmi4: Correctly configure RMI4 functions during initialization

Fix a bug where an RMI4 function handler's config() routine was not be called during rmi_function_probe().

Reported-by Dmitry Torokhov <[email protected]>

Signed-off-by Christopher Heiny <[email protected]>

Cc Dmitry Torokhov <[email protected]>

Cc Benjamin Tissoires <[email protected]>

Cc Linux Walleij <[email protected]>

Cc David Herrmann <[email protected]>

Cc Jiri Kosina <[email protected]>

Cc Courtney Cavin <[email protected]>

---

 drivers/input/rmi4/rmi_bus.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

drivers/input/rmi4/rmi_bus.c +8 -1

index 6e0454a..2ed0d32 100644
@@ -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;