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

• Lines: 123
• Date: Sun Apr 2 15:33:34 2000
• Orig file: v2.3.99-pre3/linux/drivers/char/joystick/joystick.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/drivers/char/joystick/joystick.c linux/drivers/char/joystick/joystick.c
@@ -499,6 +499,7 @@
 	if (MAJOR(inode->i_rdev) != JOYSTICK_MAJOR)
 		return -EINVAL;
 
+
 	spin_lock_irqsave(&js_lock, flags);
 
 	while (i > 0 && jd) {
@@ -510,32 +511,32 @@
 
 	if (!jd) return -ENODEV;
 
-	if ((result = jd->open(jd))) return result;
-
-	if ((new = kmalloc(sizeof(struct js_list), GFP_KERNEL))) {
+	if ((result = jd->open(jd)))
+		return result;
 
-		MOD_INC_USE_COUNT;
+	MOD_INC_USE_COUNT;
 
-		spin_lock_irqsave(&js_lock, flags);
+	if ((new = kmalloc(sizeof(struct js_list), GFP_KERNEL))) {
+		MOD_DEC_USE_COUNT;
+		return -ENOMEM;
+	}
 
-		curl = jd->list;
+	spin_lock_irqsave(&js_lock, flags);
 
-		jd->list = new;
-		jd->list->next = curl;
-		jd->list->dev = jd;
-		jd->list->startup = 0;
-		jd->list->tail = GOB(jd->bhead);
-		file->private_data = jd->list;
+	curl = jd->list;
 
-		spin_unlock_irqrestore(&js_lock, flags);
+	jd->list = new;
+	jd->list->next = curl;
+	jd->list->dev = jd;
+	jd->list->startup = 0;
+	jd->list->tail = GOB(jd->bhead);
+	file->private_data = jd->list;
 
-		if (!js_use_count++) js_do_timer(0);
+	spin_unlock_irqrestore(&js_lock, flags);
 
-	} else {
-		result = -ENOMEM;
-	}
+	if (!js_use_count++) js_do_timer(0);
 
-	return result;
+	return 0;
 }
 
 /*
@@ -573,10 +574,11 @@
 	kfree(file->private_data);
 
 	if (!--js_use_count) del_timer(&js_timer);
-	MOD_DEC_USE_COUNT;
 
 	jd->close(jd);
 
+	MOD_DEC_USE_COUNT;
+
 	return 0;
 }
 
@@ -584,50 +586,6 @@
  * js_dump_mem() dumps all data structures in memory.
  * It's used for debugging only.
  */
-
-#if 0
-static void js_dump_mem(void)
-{
-
-	struct js_port *curp = js_port;
-	struct js_dev *curd = js_dev;
-	int i;
-
-	printk(",--- Dumping Devices:\n");
-	printk("| js_dev = %x\n", (int) js_dev);
-
-	while (curd) {
-		printk("|  %s-device %x, next %x axes %d, buttons %d, port %x - %#x\n",
-			curd->next ? "|":"`",
-			(int) curd, (int) curd->next, curd->num_axes, curd->num_buttons, (int) curd->port, curd->port->io);
-		curd = curd->next;
-	}
-
-	printk(">--- Dumping ports:\n");
-	printk("| js_port = %x\n", (int) js_port);
-
-	while (curp) {
-		printk("|  %s-port %x, next %x, io %#x, devices %d\n",
-			curp->next ? "|":"`",
-			(int) curp, (int) curp->next, curp->io, curp->ndevs);
-		for (i = 0; i < curp->ndevs; i++) {
-			curd = curp->devs[i];
-			if (curd)
-			printk("|  %s %s-device %x, next %x axes %d, buttons %d, port %x\n",
-				curp->next ? "|":" ", (i < curp->ndevs-1) ? "|":"`",
-				(int) curd, (int) curd->next, curd->num_axes, curd->num_buttons, (int) curd->port);
-			else
-			printk("|  %s %s-device %x, not there\n",
-				curp->next ? "|":" ", (i < curp->ndevs-1) ? "|":"`", (int) curd);
-
-		}
-		curp = curp->next;
-	}
-
-	printk("`--- Done\n");
-}
-#endif
-
 
 struct js_port *js_register_port(struct js_port *port,
 				void *info, int devs, int infos, js_read_func read)