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

• Lines: 54
• Date: Fri Sep 10 12:59:49 1999
• Orig file: v2.3.17/linux/drivers/usb/acm.c
• Orig date: Tue Aug 31 17:29:14 1999

diff -u --recursive --new-file v2.3.17/linux/drivers/usb/acm.c linux/drivers/usb/acm.c
@@ -56,8 +56,8 @@
 #include <linux/tty_flip.h>
 #include <linux/tty.h>
 #include <linux/module.h>
-//#include <sys/ioctl.h>
-#include <asm/spinlock.h>
+#include <linux/spinlock.h>
+
 #include "usb.h"
 
 #define NR_PORTS 3
@@ -253,7 +253,7 @@
 static int rs_open(struct tty_struct *tty, struct file * filp) 
 {
 	struct acm_state *acm;
-
+	int ret;
 	
 	info("USB_FILE_OPEN\n");
 
@@ -272,10 +272,12 @@
 	acm->active=1;
  
 	/*Start reading from the device*/
-	acm->ctrltransfer=usb_request_irq(acm->dev,acm->ctrlpipe, acm_irq, acm->ctrlinterval, acm);
-	
+	ret = usb_request_irq(acm->dev,acm->ctrlpipe, acm_irq, acm->ctrlinterval, acm, &acm->ctrltransfer);
+	if (ret) {
+		printk (KERN_WARNING "usb-acm: usb_request_irq failed (0x%x)\n", ret);
+	}
 	acm->reading=1;
-	acm->readtransfer=usb_request_bulk(acm->dev,acm->readpipe, acm_read_irq, acm->readbuffer, acm->readsize, acm );
+	acm->readtransfer=usb_request_bulk(acm->dev,acm->readpipe, acm_read_irq, acm->readbuffer, acm->readsize, acm);
 	
 	Set_Control_Line_Status (CTRL_STAT_DTR | CTRL_STAT_RTS, acm);
 				                  
@@ -307,7 +309,7 @@
 		usb_terminate_bulk(acm->dev, acm->readtransfer);
 		acm->reading=0;
 	}
-//  usb_release_irq(acm->dev,acm->ctrltransfer);
+//  usb_release_irq(acm->dev,acm->ctrltransfer, acm->ctrlpipe);
 	
 	acm->active=0;
 }
@@ -591,7 +593,7 @@
 		usb_terminate_bulk(acm->dev, acm->readtransfer);
 		acm->reading=0;
 	}
-//  usb_release_irq(acm->dev,acm->ctrltransfer);
+//  usb_release_irq(acm->dev,acm->ctrltransfer, acm->ctrlpipe);
 	//BUG: What to do if a device is open?? Notify process or not allow cleanup?
 	acm->active=0;
 	acm->present=0;