[Linuxconsole-commit]CVS: ruby/linux/drivers/usb/input hid-core.c,1.1,1.2 hid-lg3dff.c,1.1,1.2 hid-lgff.c,1.2,1.3

[johann d. <jd...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/drivers/usb/input
In directory usw-pr-cvs1:/tmp/cvs-serv7903/linux/drivers/usb/input

Modified Files:
	hid-core.c hid-lg3dff.c hid-lgff.c 
Log Message:
hid-core.c: Do not abort init when there is no support for force-feedback.
hid-lg*ff.c: Cleaned-up a few confusing lines.


Index: hid-core.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-core.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hid-core.c	16 Apr 2002 17:41:51 -0000	1.1
+++ hid-core.c	26 Apr 2002 16:26:00 -0000	1.2
@@ -1415,7 +1415,16 @@
 	hid_dump_device(hid);
 
 #ifdef CONFIG_HID_FF
-	if (hid_ff_init(hid)) {
+	switch (hid_ff_init(hid)) {
+	case 0:
+		break;
+
+	case -ENOSYS:
+		info("No force feedback support for this hid device");
+		break;
+
+	default:
+		err("hid_ff_init failed");
 		hid_free_device(hid);
 		return NULL;
 	}

Index: hid-lg3dff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-lg3dff.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hid-lg3dff.c	18 Apr 2002 22:02:47 -0000	1.1
+++ hid-lg3dff.c	26 Apr 2002 16:26:00 -0000	1.2
@@ -98,8 +98,7 @@
 	struct lg3d_device *private;
 
 	/* Private data */
-	hid->ff_private = kmalloc(sizeof(struct lg3d_device), GFP_KERNEL);
-	private = hid->ff_private;
+	private = kmalloc(sizeof(struct lg3d_device), GFP_KERNEL);
 	if (!private) return -1;
 
 	memset(private, 0, sizeof(struct lg3d_device));

Index: hid-lgff.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/usb/input/hid-lgff.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hid-lgff.c	18 Apr 2002 22:02:47 -0000	1.2
+++ hid-lgff.c	26 Apr 2002 16:26:00 -0000	1.3
@@ -121,8 +121,7 @@
 	int i;
 
 	/* Private data */
-	hid->ff_private = kmalloc(sizeof(struct hid_ff_logitech), GFP_KERNEL);
-	private = hid->ff_private;
+	private = kmalloc(sizeof(struct hid_ff_logitech), GFP_KERNEL);
 	if (!private) return -1;
 
 	memset(private, 0, sizeof(struct hid_ff_logitech));