Fixes a pending FIXME to set input_dev->dev.parent correctly.
Since we'll soon be discarding the per-function input_devs and
using just a single input_dev for all the functions on a particular
rmi_dev, we use the rmi_dev->dev as the parent device for the
input_dev.

Signed-off-by: Christopher Heiny <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Benjamin Tissoires <[email protected]>

---

 drivers/input/rmi4/rmi_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 3483e5b..c01a6b8 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -325,7 +325,7 @@ static int process_interrupt_requests(struct rmi_device 
*rmi_dev)
 static int rmi_driver_set_input_params(struct rmi_device *rmi_dev,
                                struct input_dev *input)
 {
-       // FIXME: set up parent
+       input->dev.parent = &rmi_dev->dev;
        input->name = SYNAPTICS_INPUT_DEVICE_NAME;
        input->id.vendor  = SYNAPTICS_VENDOR_ID;
        input->id.bustype = BUS_RMI;
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to