diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-12-06 20:14:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-12-06 20:14:23 +0100 |
| commit | afbd65f5e71a37fc9f46cb3e867e141a65d6ec25 (patch) | |
| tree | a597cd1bcfc6816b08dbc6d7e7fea395fa61d898 /drivers/input/rmi4 | |
| parent | Merge branch 'next' into for-linus (diff) | |
| parent | Input: synaptics-rmi4 - don't increment rmiaddr for SMBus transfers (diff) | |
| download | linux-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.tar.xz linux-afbd65f5e71a37fc9f46cb3e867e141a65d6ec25.zip | |
Merge branch 'next' into for-linus
Prepare second round of updates for 5.5 merge window.
Diffstat (limited to 'drivers/input/rmi4')
| -rw-r--r-- | drivers/input/rmi4/rmi_f34v7.c | 3 | ||||
| -rw-r--r-- | drivers/input/rmi4/rmi_smbus.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c index a4cabf52740c..74f7c6f214ff 100644 --- a/drivers/input/rmi4/rmi_f34v7.c +++ b/drivers/input/rmi4/rmi_f34v7.c @@ -1189,6 +1189,9 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw) { int ret; + f34->fn->rmi_dev->driver->set_irq_bits(f34->fn->rmi_dev, + f34->fn->irq_mask); + rmi_f34v7_read_queries_bl_version(f34); f34->v7.image = fw->data; diff --git a/drivers/input/rmi4/rmi_smbus.c b/drivers/input/rmi4/rmi_smbus.c index 2407ea43de59..b313c579914f 100644 --- a/drivers/input/rmi4/rmi_smbus.c +++ b/drivers/input/rmi4/rmi_smbus.c @@ -163,7 +163,6 @@ static int rmi_smb_write_block(struct rmi_transport_dev *xport, u16 rmiaddr, /* prepare to write next block of bytes */ cur_len -= SMB_MAX_COUNT; databuff += SMB_MAX_COUNT; - rmiaddr += SMB_MAX_COUNT; } exit: mutex_unlock(&rmi_smb->page_mutex); @@ -215,7 +214,6 @@ static int rmi_smb_read_block(struct rmi_transport_dev *xport, u16 rmiaddr, /* prepare to read next block of bytes */ cur_len -= SMB_MAX_COUNT; databuff += SMB_MAX_COUNT; - rmiaddr += SMB_MAX_COUNT; } retval = 0; |