Re: [PATCH 4.19 54/86] Input: elan_i2c - only increment wakeup count on touch

Sasha Levin
2020-07-27T23:29:33Z

On Mon, Jul 27, 2020 at 03:18:06PM -0700, dbasehore . wrote:
>On Mon, Jul 27, 2020 at 3:01 PM Dmitry Torokhov
><dmitry.torokhov@gmail.com> wrote:
>>
>> On Mon, Jul 27, 2020 at 11:29:33PM +0200, Pavel Machek wrote:
>> > Hi!
>> >
>> > > From: Derek Basehore <dbasehore@chromium.org>
>> > >
>> > > [ Upstream commit 966334dfc472bdfa67bed864842943b19755d192 ]
>> > >
>> > > This moves the wakeup increment for elan devices to the touch report.
>> > > This prevents the drivers from incorrectly reporting a wakeup when the
>> > > resume callback resets then device, which causes an interrupt to
>> > > occur.
>> >
>> > Contrary to the changelog, this does not move anything... unlike
>> > mainline, it simply adds two pm_wakeup_events.
>> >
>> > It may still be correct, but maybe someone wants to double-check?
>>
>> Good catch, I believe the backport is busted.
>
>I don't believe it will break anything, but the backport isn't needed
>in 4.19 since "Input: elan_i2c - increment wakeup count if wake
>source" wasn't merged into 4.19. It's probably best to drop the
>backport.

Hm, I wonder how this happened. It was just a cherry pick in this case
:/

Either way, I've dropped it from 4.19, thanks!

--
Thanks,
Sasha