[Linuxconsole-commit]CVS: ruby/linux/drivers/input/joystick/iforce iforce-main.c,1.12,1.13

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

Update of /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce
In directory usw-pr-cvs1:/tmp/cvs-serv21186

Modified Files:
	iforce-main.c 
Log Message:
FF_FRICTION effects are not supported, FF_DAMPER are.
Do not unlink the out urb upon release. Pending packets must be sent.


Index: iforce-main.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/input/joystick/iforce/iforce-main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- iforce-main.c	3 Feb 2002 20:04:39 -0000	1.12
+++ iforce-main.c	8 Feb 2002 23:02:34 -0000	1.13
@@ -44,7 +44,7 @@
 static signed short abs_joystick[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_HAT0X, ABS_HAT0Y, -1 };
 static signed short abs_joystick2[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER, ABS_HAT0X, ABS_HAT0Y, -1 };
 static signed short abs_wheel[] =    { ABS_WHEEL, ABS_GAS, ABS_BRAKE, ABS_HAT0X, ABS_HAT0Y, -1 };
-static signed short ff_iforce[] =    { FF_PERIODIC, FF_CONSTANT, FF_SPRING, FF_FRICTION,
+static signed short ff_iforce[] =    { FF_PERIODIC, FF_CONSTANT, FF_SPRING, FF_DAMPER,
 	FF_SQUARE, FF_TRIANGLE, FF_SINE, FF_SAW_UP, FF_SAW_DOWN, FF_GAIN, FF_AUTOCENTER, -1 };
 
 static struct iforce_device iforce_device[] = {
@@ -122,6 +122,10 @@
 	int ret;
 	int is_update;
 
+/* Check this effect type is supported by this device */
+	if (!test_bit(effect->type, iforce->dev.ffbit))
+		return -EINVAL;
+
 /*
  * If we want to create a new effect, get a free id
  */
@@ -169,7 +173,7 @@
 			break;
 
 		case FF_SPRING:
-		case FF_FRICTION:
+		case FF_DAMPER:
 			ret = iforce_upload_condition(iforce, effect, is_update);
 			break;
 
@@ -280,7 +284,6 @@
 		case IFORCE_USB:
 printk(KERN_DEBUG "Unlinking irq URB\n");
 			usb_unlink_urb(&iforce->irq);
-			usb_unlink_urb(&iforce->out);
 
 			/* The device was unplugged before the file
 			 * was released */