[PATCH 1/5] input: Fix Set3 keycode for right control in atkbd.c

[PATCH 1/5] input: Fix Set3 keycode for right control in atkbd.c

[Vojtech Pavlik]

You can pull this changeset from:
	bk://kernel.bkbits.net/vojtech/input

===================================================================

ChangeSet@1.1350, 2003-09-19 13:15:12+02:00, Andries.Brouwer@cwi.nl
  input: Fix Set3 keycode for right control in atkbd.c


 atkbd.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

===================================================================

diff -Nru a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/keyboard/atkbd.c	Fri Sep 19 14:13:04 2003
+++ b/drivers/input/keyboard/atkbd.c	Fri Sep 19 14:13:04 2003
@@ -71,7 +71,7 @@
 	134, 46, 45, 32, 18,  5,  4, 63,135, 57, 47, 33, 20, 19,  6, 64,
 	136, 49, 48, 35, 34, 21,  7, 65,137,100, 50, 36, 22,  8,  9, 66,
 	125, 51, 37, 23, 24, 11, 10, 67,126, 52, 53, 38, 39, 25, 12, 68,
-	113,114, 40, 84, 26, 13, 87, 99,100, 54, 28, 27, 43, 84, 88, 70,
+	113,114, 40, 84, 26, 13, 87, 99, 97, 54, 28, 27, 43, 84, 88, 70,
 	108,105,119,103,111,107, 14,110,  0, 79,106, 75, 71,109,102,104,
 	 82, 83, 80, 76, 77, 72, 69, 98,  0, 96, 81,  0, 78, 73, 55, 85,
 	 89, 90, 91, 92, 74,185,184,182,  0,  0,  0,125,126,127,112,  0,

[PATCH 3/5] Remove a not necessary #ifdef CONFIG_PROC_FS/#endif in input.c

[Vojtech Pavlik]

You can pull this changeset from:
	bk://kernel.bkbits.net/vojtech/input

===================================================================

ChangeSet@1.1352, 2003-09-19 13:25:06+02:00, lcapitulino@prefeitura.sp.gov.br
  input: Remove a not necessary #ifdef CONFIG_PROC_FS/#endif in input.c


 input.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

===================================================================

diff -Nru a/drivers/input/input.c b/drivers/input/input.c
--- a/drivers/input/input.c	Fri Sep 19 14:12:49 2003
+++ b/drivers/input/input.c	Fri Sep 19 14:12:49 2003
@@ -737,11 +737,10 @@
 
 static void __exit input_exit(void)
 {
-#ifdef CONFIG_PROC_FS
 	remove_proc_entry("devices", proc_bus_input_dir);
 	remove_proc_entry("handlers", proc_bus_input_dir);
 	remove_proc_entry("input", proc_bus);
-#endif
+
 	devfs_remove("input");
 	unregister_chrdev(INPUT_MAJOR, "input");
 	class_unregister(&input_class);

[PATCH 2/5] Fix a warning in input.c when CONFIG_PROC_FS is not set

[Vojtech Pavlik]

You can pull this changeset from:
	bk://kernel.bkbits.net/vojtech/input

===================================================================

ChangeSet@1.1351, 2003-09-19 13:23:54+02:00, lcapitulino@prefeitura.sp.gov.br
  input: Fix a warning in input.c when CONFIG_PROC_FS is not set.


 input.c |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

===================================================================

diff -Nru a/drivers/input/input.c b/drivers/input/input.c
--- a/drivers/input/input.c	Fri Sep 19 14:12:57 2003
+++ b/drivers/input/input.c	Fri Sep 19 14:12:57 2003
@@ -678,20 +678,10 @@
 	return (count > cnt) ? cnt : count;
 }
 
-#endif
-
-struct class input_class = {
-	.name		= "input",
-};
-
-static int __init input_init(void)
+static int __init input_proc_init(void)
 {
 	struct proc_dir_entry *entry;
-	int retval = -ENOMEM;
-
-	class_register(&input_class);
 
-#ifdef CONFIG_PROC_FS
 	proc_bus_input_dir = proc_mkdir("input", proc_bus);
 	if (proc_bus_input_dir == NULL)
 		return -ENOMEM;
@@ -710,7 +700,22 @@
 		return -ENOMEM;
 	}
 	entry->owner = THIS_MODULE;
+	return 0;
+}
+#else /* !CONFIG_PROC_FS */
+static inline int input_proc_init(void) { return 0; }
 #endif
+
+struct class input_class = {
+	.name		= "input",
+};
+
+static int __init input_init(void)
+{
+	int retval = -ENOMEM;
+
+	class_register(&input_class);
+	input_proc_init();
 	retval = register_chrdev(INPUT_MAJOR, "input", &input_fops);
 	if (retval) {
 		printk(KERN_ERR "input: unable to register char major %d", INPUT_MAJOR);

[PATCH 4/5] Fix memory leak in hiddev.c found by Stanford Checker

[Vojtech Pavlik]

You can pull this changeset from:
	bk://kernel.bkbits.net/vojtech/input

===================================================================

ChangeSet@1.1353, 2003-09-19 13:32:38+02:00, vojtech@suse.cz
  input: Fix memory leak in hiddev.c found by Stanford Checker.


 hiddev.c |    1 +
 1 files changed, 1 insertion(+)

===================================================================

diff -Nru a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
--- a/drivers/usb/input/hiddev.c	Fri Sep 19 14:12:42 2003
+++ b/drivers/usb/input/hiddev.c	Fri Sep 19 14:12:42 2003
@@ -727,6 +727,7 @@
  	retval = usb_register_dev(&hiddev->intf, &hiddev_class);
 	if (retval) {
 		err("Not able to get a minor for this device.");
+		kfree(hiddev);
 		return -1;
 	}
 

[PATCH 5/5] Fix Kconfig KEYBOARD_ATKBD when SERIO is modular

[Vojtech Pavlik]

You can pull this changeset from:
	bk://kernel.bkbits.net/vojtech/input

===================================================================

ChangeSet@1.1354, 2003-09-19 13:51:40+02:00, bunk@fs.tum.de
  input: Fix Kconfig KEYBOARD_ATKBD when SERIO is modular.


 Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

===================================================================

diff -Nru a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/Kconfig	Fri Sep 19 14:12:35 2003
+++ b/drivers/input/keyboard/Kconfig	Fri Sep 19 14:12:35 2003
@@ -13,7 +13,8 @@
 
 config KEYBOARD_ATKBD
 	tristate "AT keyboard support" if EMBEDDED || !X86 
-	default y
+	default y if INPUT=y && INPUT_KEYBOARD=y && SERIO=y
+	default m
 	depends on INPUT && INPUT_KEYBOARD && SERIO
 	help
 	  Say Y here if you want to use a standard AT or PS/2 keyboard. Usually