From: Mark Lord <mlord@pobox.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org
Subject: Re: Recent change to hid-core.c
Date: Mon, 16 Dec 2013 09:52:20 -0500 [thread overview]
Message-ID: <52AF13A4.8030900@pobox.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1312161418110.12882@pobox.suse.cz>
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
On 13-12-16 08:24 AM, Jiri Kosina wrote:
> On Sun, 15 Dec 2013, Mark Lord wrote:
>
>> The recent update 08ec2dcc3527a20c619aca2fb36f800908256bac
>> "Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus"
>> included an unexpected change to the return code handing for ->raw_event() calls.
,,
>> Was this intentional? Doesn't that have side-effects for some drivers?
..
> this was intentional -- please see commit b1a1442a23 and discussion here:
> https://lkml.org/lkml/2013/3/21/591
..
Thanks Jiri.
In that case you'll be wanting this patch (unmangled copy attached) as well
to clean up a tiny bit of leftover logic in there.
* * * * * * SNIP * * * * * *
Recent updates to raw_event handling resulted in some leftover "dead" logic
in hid-core.c::hid_input_report(). Nuke it.
Signed-off-by: Mark Lord <mlord@pobox.com>
--- old/drivers/hid/hid-core.c 2013-12-12 01:38:07.000000000 -0500
+++ linux/drivers/hid/hid-core.c 2013-12-16 09:48:27.339162173 -0500
@@ -1418,10 +1418,8 @@
if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
ret = hdrv->raw_event(hid, report, data, size);
- if (ret < 0) {
- ret = ret < 0 ? ret : 0;
+ if (ret < 0)
goto unlock;
- }
}
ret = hid_report_raw_event(hid, type, data, size, interrupt);
[-- Attachment #2: hid_core_remove_leftover_logic.patch --]
[-- Type: text/x-patch, Size: 599 bytes --]
Recent updates to raw_event handling resulted in some leftover "dead" logic
in hid-core.c::hid_input_report(). Nuke it.
Signed-off-by: Mark Lord <mlord@pobox.com>
--- old/drivers/hid/hid-core.c 2013-12-12 01:38:07.000000000 -0500
+++ linux/drivers/hid/hid-core.c 2013-12-16 09:48:27.339162173 -0500
@@ -1418,10 +1418,8 @@
if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
ret = hdrv->raw_event(hid, report, data, size);
- if (ret < 0) {
- ret = ret < 0 ? ret : 0;
+ if (ret < 0)
goto unlock;
- }
}
ret = hid_report_raw_event(hid, type, data, size, interrupt);
next prev parent reply other threads:[~2013-12-16 14:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-15 5:26 Recent change to hid-core.c Mark Lord
2013-12-16 13:24 ` Jiri Kosina
2013-12-16 14:52 ` Mark Lord [this message]
2013-12-16 14:56 ` Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52AF13A4.8030900@pobox.com \
--to=mlord@pobox.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).