From: Ryan Mallon <rmallon@gmail.com>
To: dmitry.torokhov@gmail.com, rydberg@euromail.se
Cc: carl@ok-labs.com, linux-input@vger.kernel.org,
linux-kernel@vger.kernel.org, Ryan Mallon <rmallon@gmail.com>
Subject: [PATCH 2/2] uinput: Use input_inject_event in uinput_inject_event
Date: Wed, 11 Sep 2013 09:32:53 +1000 [thread overview]
Message-ID: <1378855973-11595-2-git-send-email-rmallon@gmail.com> (raw)
In-Reply-To: <1378855973-11595-1-git-send-email-rmallon@gmail.com>
Call input_inject_event rather than input_event in uinput_inject_event. This
mirrors the behaviour of evdev_write. input_inject_event will ignore the
injected event if the uinput input device has been grabbed for exclusive
access by a handler other than uinput.
Signed-off-by: Ryan Mallon <rmallon@gmail.com>
---
drivers/input/misc/uinput.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 6aea346..0962ecb 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -443,7 +443,7 @@ static ssize_t uinput_inject_event(struct uinput_device *udev,
if (input_event_from_user(buffer + bytes, &ev))
return -EFAULT;
- input_event(udev->dev, ev.type, ev.code, ev.value);
+ input_inject_event(udev->dev, ev.type, ev.code, ev.value);
bytes += input_event_size();
}
--
1.7.9.7
next prev parent reply other threads:[~2013-09-10 23:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 23:32 [PATCH 1/2] uinput: Support injecting multiple events in one write() call Ryan Mallon
2013-09-10 23:32 ` Ryan Mallon [this message]
2013-09-11 0:12 ` [PATCH 2/2] uinput: Use input_inject_event in uinput_inject_event Dmitry Torokhov
2013-09-11 0:26 ` Ryan Mallon
2013-09-11 0:14 ` [PATCH 1/2] uinput: Support injecting multiple events in one write() call Dmitry Torokhov
2013-09-11 0:29 ` Ryan Mallon
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=1378855973-11595-2-git-send-email-rmallon@gmail.com \
--to=rmallon@gmail.com \
--cc=carl@ok-labs.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@euromail.se \
/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
all inboxes | Powered by JetHome®