patch-2.3.36 linux/drivers/usb/acm.c

• Lines: 62
• Date: Tue Jan 4 11:30:23 2000
• Orig file: v2.3.35/linux/drivers/usb/acm.c
• Orig date: Wed Dec 29 13:13:19 1999

diff -u --recursive --new-file v2.3.35/linux/drivers/usb/acm.c linux/drivers/usb/acm.c
@@ -243,13 +243,10 @@
 
 	if (!acm->present) return -EINVAL;
 
-	if (acm->used++) {
-		MOD_INC_USE_COUNT;
-		return 0;
-	}
-
 	MOD_INC_USE_COUNT;
 
+	if (acm->used++) return 0;
+
 	if (usb_submit_urb(&acm->ctrlurb))
 		acm_debug("usb_submit_urb(ctrl irq) failed");
 
@@ -265,18 +262,18 @@
 {
 	struct acm *acm = tty->driver_data;
 
-	if (!ACM_READY(acm)) return;
-
-	if (--acm->used) {
-		MOD_DEC_USE_COUNT;
-		return;
-	}
-
-	acm_set_control(acm->ctrlout = 0, acm);
-	usb_unlink_urb(&acm->writeurb);
-	usb_unlink_urb(&acm->readurb);
+	if (!acm->used) return;
 
 	MOD_DEC_USE_COUNT;
+
+	if (--acm->used) return;
+	
+	if (acm->present) {
+		acm_set_control(acm->ctrlout = 0, acm);
+		usb_unlink_urb(&acm->ctrlurb);
+		usb_unlink_urb(&acm->writeurb);
+		usb_unlink_urb(&acm->readurb);
+	}
 }
 
 static int acm_tty_write(struct tty_struct *tty, int from_user, const unsigned char *buf, int count)
@@ -348,7 +345,6 @@
 	struct usb_endpoint_descriptor *epctrl, *epread, *epwrite;
 	int readsize, ctrlsize, minor, i;
 	unsigned char *buf;
-	char *s = NULL;
 
 	for (minor = 0; minor < ACM_TTY_MINORS &&
 		(acm_table[minor].present || acm_table[minor].used); minor++);
@@ -422,6 +418,8 @@
 
 		usb_driver_claim_interface(&acm_driver, acm->cfg->interface + 0, acm);
 		usb_driver_claim_interface(&acm_driver, acm->cfg->interface + 1, acm);
+
+		acm_set_control(acm->ctrlout, acm);
 
 		acm->present = 1;