linux-kernel - linux-next: manual merge of the hid tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 9 Nov 2010 12:33:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jikos@...os.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Joe Perches <joe@...ches.com>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: linux-next: manual merge of the hid tree with Linus' tree

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@...b.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;
  	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/