diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-28 17:10:54 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-12-28 17:10:54 -0800 |
commit | 592b15ba7260f8dec8bfc71ef0ea1934801a35aa (patch) | |
tree | 51ead1b83e10da0cf6623116f37a15bc142f9d8b /drivers/input/touchscreen/inexio.c | |
parent | 7db54c89f0b30a101584e09d3729144e6170059d (diff) | |
parent | 1e3c336ad8f40f88a8961c434640920fe35cc08b (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 4.21 merge window.
Diffstat (limited to 'drivers/input/touchscreen/inexio.c')
-rw-r--r-- | drivers/input/touchscreen/inexio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/inexio.c b/drivers/input/touchscreen/inexio.c index b9bc56233ccc..13bd0bf580a7 100644 --- a/drivers/input/touchscreen/inexio.c +++ b/drivers/input/touchscreen/inexio.c @@ -79,7 +79,7 @@ static void inexio_process_data(struct inexio *pinexio) static irqreturn_t inexio_interrupt(struct serio *serio, unsigned char data, unsigned int flags) { - struct inexio* pinexio = serio_get_drvdata(serio); + struct inexio *pinexio = serio_get_drvdata(serio); pinexio->data[pinexio->idx] = data; @@ -97,7 +97,7 @@ static irqreturn_t inexio_interrupt(struct serio *serio, static void inexio_disconnect(struct serio *serio) { - struct inexio* pinexio = serio_get_drvdata(serio); + struct inexio *pinexio = serio_get_drvdata(serio); input_get_device(pinexio->dev); input_unregister_device(pinexio->dev); |