From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jiri Kosina <jikos@jikos•cz>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Joe Perches <joe@perches•com>,
Dmitry Torokhov <dmitry.torokhov@gmail•com>
Subject: linux-next: manual merge of the hid tree with Linus' tree
Date: Tue, 9 Nov 2010 12:33:26 +1100 [thread overview]
Message-ID: <20101109123326.8e4a3c99.sfr@canb.auug.org.au> (raw)
Hi Jiri,
Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-input.c between commit
a0bf0ea809ba0a7621e191ec4cab5775d502ef7e ("Input: hid-input - switch to
using new keycode interface") from Linus' tree and commit
587d145200f26758940099fbbc301fdd43d3f391 ("HID: Remove KERN_DEBUG from
dbg_hid use") from the hid tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/hid/hid-input.c
index bb0b365,76e1f64..0000000
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@@ -165,24 -127,21 +165,24 @@@ static int hidinput_setkeycode(struct i
{
struct hid_device *hid = input_get_drvdata(dev);
struct hid_usage *usage;
- int old_keycode;
- usage = hidinput_find_key(hid, scancode, 0);
+ usage = hidinput_locate_usage(hid, ke, NULL);
if (usage) {
- old_keycode = usage->code;
- usage->code = keycode;
+ *old_keycode = usage->type == EV_KEY ?
+ usage->code : KEY_RESERVED;
+ usage->code = ke->keycode;
- clear_bit(old_keycode, dev->keybit);
+ clear_bit(*old_keycode, dev->keybit);
set_bit(usage->code, dev->keybit);
- dbg_hid(KERN_DEBUG "Assigned keycode %d to HID usage code %x\n",
+ dbg_hid("Assigned keycode %d to HID usage code %x\n",
- keycode, scancode);
- /* Set the keybit for the old keycode if the old keycode is used
- * by another key */
- if (hidinput_find_key (hid, 0, old_keycode))
- set_bit(old_keycode, dev->keybit);
+ usage->code, usage->hid);
+
+ /*
+ * Set the keybit for the old keycode if the old keycode is used
+ * by another key
+ */
+ if (hidinput_find_key(hid, match_keycode, *old_keycode, NULL))
+ set_bit(*old_keycode, dev->keybit);
return 0;
}
next reply other threads:[~2010-11-09 1:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 1:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-10-11 3:37 linux-next: manual merge of the hid tree with Linus' tree Stephen Rothwell
2011-10-11 10:52 ` Jiri Kosina
2012-06-27 1:05 Stephen Rothwell
2012-09-10 1:33 Stephen Rothwell
2012-09-10 5:49 ` Marek Vasut
2013-03-28 0:40 Stephen Rothwell
2014-02-20 2:03 Stephen Rothwell
2014-02-20 2:04 Stephen Rothwell
2014-03-17 2:32 Stephen Rothwell
2014-10-31 0:58 Stephen Rothwell
2015-02-24 0:00 Stephen Rothwell
2022-04-21 23:33 Stephen Rothwell
2023-08-15 1:53 Stephen Rothwell
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=20101109123326.8e4a3c99.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=jikos@jikos$(echo .)cz \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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