diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 20:20:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-27 20:20:39 +0300 |
| commit | ed3f4e239834317934cc73a187e27e44b217056b (patch) | |
| tree | 6990e64bde453357c1a58f1378c6c4dace9b9383 /drivers/input/touchscreen/elants_i2c.c | |
| parent | c7b7eefa57ae3c8802fdec7d07ac4df6c49d1e7a (diff) | |
| parent | cacd9759eea2f1c7e8792ecd91ed4602f963b1a5 (diff) | |
| download | linux-ed3f4e239834317934cc73a187e27e44b217056b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just random driver fixups, nothing exiting"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: synaptics - avoid using uninitialized variable when probing
Input: xen-kbdfront - mark expected switch fall-through
Input: atmel_mxt_ts - mark expected switch fall-through
Input: cyapa - mark expected switch fall-throughs
Input: wm97xx-ts - fix exit path
Input: of_touchscreen - add support for touchscreen-min-x|y
Input: Fix DIR-685 touchkeys MAINTAINERS entry
Input: elants_i2c - use DMA safe i2c when possible
Input: silead - try firmware reload after unsuccessful resume
Input: st1232 - set INPUT_PROP_DIRECT property
Input: xilinx_ps2 - convert to using %pOFn instead of device_node.name
Input: atmel_mxt_ts - fix multiple <linux/property.h> includes
Input: sun4i-lradc - convert to using %pOFn instead of device_node.name
Input: pwm-vibrator - correct pwms in DT binding example
Diffstat (limited to 'drivers/input/touchscreen/elants_i2c.c')
| -rw-r--r-- | drivers/input/touchscreen/elants_i2c.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index d21ca39b0fdb..f2cb23121833 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c @@ -147,10 +147,11 @@ struct elants_data { u8 cmd_resp[HEADER_SIZE]; struct completion cmd_done; - u8 buf[MAX_PACKET_SIZE]; - bool wake_irq_enabled; bool keep_power_in_suspend; + + /* Must be last to be used for DMA operations */ + u8 buf[MAX_PACKET_SIZE] ____cacheline_aligned; }; static int elants_i2c_send(struct i2c_client *client, @@ -863,7 +864,7 @@ static irqreturn_t elants_i2c_irq(int irq, void *_dev) int i; int len; - len = i2c_master_recv(client, ts->buf, sizeof(ts->buf)); + len = i2c_master_recv_dmasafe(client, ts->buf, sizeof(ts->buf)); if (len < 0) { dev_err(&client->dev, "%s: failed to read data: %d\n", __func__, len); |