[Linuxconsole-commit]CVS: ruby/ruby-2.6/drivers/input input.c,1.2,1.3

[Aivils S. <ai...@us...>]

Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22114/ruby-2.6/drivers/input

Modified Files:
	input.c 
Log Message:
sync to 2.6.1

Index: input.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/input/input.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.c	2 Oct 2003 09:32:18 -0000	1.2
+++ input.c	5 Feb 2004 11:53:56 -0000	1.3
@@ -447,9 +447,10 @@
 	list_add_tail(&dev->node, &input_dev_list);
 
 	list_for_each_entry(handler, &input_handler_list, node)
-		if ((id = input_match_device(handler->id_table, dev)))
-			if ((handle = handler->connect(handler, dev, id)))
-				input_link_handle(handle);
+                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
+                        if ((id = input_match_device(handler->id_table, dev)))
+                                if ((handle = handler->connect(handler, dev, id)))
+                                        input_link_handle(handle);
 
 #ifdef CONFIG_HOTPLUG
 	input_call_hotplug("add", dev);
@@ -507,9 +508,10 @@
 	list_add_tail(&handler->node, &input_handler_list);
 	
 	list_for_each_entry(dev, &input_dev_list, node)
-		if ((id = input_match_device(handler->id_table, dev)))
-			if ((handle = handler->connect(handler, dev, id)))
-				input_link_handle(handle);
+                if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
+                        if ((id = input_match_device(handler->id_table, dev)))
+                                if ((handle = handler->connect(handler, dev, id)))
+                                        input_link_handle(handle);
 
 #ifdef CONFIG_PROC_FS
 	input_devices_state++;