diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-06 14:17:39 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-06 14:17:39 -0800 |
| commit | d5e6e0fa442a479e27dfb7d17aeef1260dc19b09 (patch) | |
| tree | b0a3d1b6c32335b009493d79b30f8e59ed60f269 /drivers/input/rmi4/rmi_bus.c | |
| parent | 57b8443d3e5bd046a519ff714ca31c64c7f04309 (diff) | |
| parent | f32361b71ae5c81b8fb96f796ab947ba2ad17aa8 (diff) | |
Merge branch 'synaptics-rmi4' into next
Bring in latest RMI4 support in preparation to the merge window.
Diffstat (limited to 'drivers/input/rmi4/rmi_bus.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c index 213e3189f74c..ae1bffe45c75 100644 --- a/drivers/input/rmi4/rmi_bus.c +++ b/drivers/input/rmi4/rmi_bus.c @@ -261,10 +261,10 @@ int __rmi_register_function_handler(struct rmi_function_handler *handler, driver->probe = rmi_function_probe; driver->remove = rmi_function_remove; - error = driver_register(&handler->driver); + error = driver_register(driver); if (error) { pr_err("driver_register() failed for %s, error: %d\n", - handler->driver.name, error); + driver->name, error); return error; } |