diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 11:19:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-04-13 11:19:41 +1000 |
| commit | 733a244e1d49fbbb217567a69a00b81171a6f4e2 (patch) | |
| tree | 501c706e51e422ed91b24e83c04e9fdacb0b95b8 /drivers/input | |
| parent | b1795780395fc5688dc135e6e1927895509f1748 (diff) | |
| parent | 38c466aa452821cb17eeb4568f7da33bee415158 (diff) | |
| download | linux-next-733a244e1d49fbbb217567a69a00b81171a6f4e2.tar.gz | |
Merge remote-tracking branch 'i2c/i2c/for-next'
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/elantech.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 97381e2e03ba..2d0bc029619f 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1885,8 +1885,6 @@ static int elantech_create_smbus(struct psmouse *psmouse, }; unsigned int idx = 0; - smbus_board.properties = i2c_props; - i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-x", info->x_max + 1); i2c_props[idx++] = PROPERTY_ENTRY_U32("touchscreen-size-y", @@ -1918,6 +1916,10 @@ static int elantech_create_smbus(struct psmouse *psmouse, if (elantech_is_buttonpad(info)) i2c_props[idx++] = PROPERTY_ENTRY_BOOL("elan,clickpad"); + smbus_board.fwnode = fwnode_create_software_node(i2c_props, NULL); + if (IS_ERR(smbus_board.fwnode)) + return PTR_ERR(smbus_board.fwnode); + return psmouse_smbus_init(psmouse, &smbus_board, NULL, 0, false, leave_breadcrumbs); } |