patch-2.3.99-pre4 linux/drivers/char/joystick/joy-spaceorb.c

Next file: linux/drivers/char/joystick/joy-warrior.c
Previous file: linux/drivers/char/joystick/joy-spaceball.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/char/joystick/joy-spaceorb.c linux/drivers/char/joystick/joy-spaceorb.c
@@ -199,6 +199,8 @@
 	struct js_orb_info iniinfo;
 	struct js_orb_info *info = &iniinfo;
 
+	MOD_INC_USE_COUNT;
+
 	info->tty = tty;
 	info->idx = 0;
 	info->used = 1;
@@ -213,8 +215,6 @@
 
 	js_orb_init_corr(js_orb_port->corr);
 
-	MOD_INC_USE_COUNT;
-
 	return 0;
 }
 
@@ -270,9 +270,7 @@
 
 static struct tty_ldisc js_orb_ldisc = {
 	magic:		TTY_LDISC_MAGIC,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
 	name:		"spaceorb",
-#endif
 	open:		js_orb_ldisc_open,
 	close:		js_orb_ldisc_close,
 	receive_buf:	js_orb_ldisc_receive,

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)