This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / usb / serial / kl5kusb105.c

diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index c5207d1..99fb540 100644 (file)
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -56,10 +56,16 @@
 #include <linux/module.h>
 #include <asm/uaccess.h>
 #include <linux/usb.h>
+
+#ifdef CONFIG_USB_SERIAL_DEBUG
+       static int debug = 1;
+#else
+       static int debug;
+#endif
+
 #include "usb-serial.h"
 #include "kl5kusb105.h"
 
-static int debug;
 
 /*
  * Version Information
@@ -653,8 +659,7 @@ static void klsi_105_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
        } else if (urb->actual_length <= 2) {
                dbg("%s - size %d URB not understood", __FUNCTION__,
                    urb->actual_length);
-               usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
-                                     urb->actual_length, data);
+               usb_serial_debug_data (__FILE__, __FUNCTION__, urb->actual_length, data);
        } else {
                int i;
                int bytes_sent = ((__u8 *) data)[0] +
@@ -666,8 +671,8 @@ static void klsi_105_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
                 * intermixed tty_flip_buffer_push()s
                 * FIXME
                 */ 
-               usb_serial_debug_data(debug, &port->dev, __FUNCTION__,
-                                     urb->actual_length, data);
+               usb_serial_debug_data (__FILE__, __FUNCTION__,
+                                      urb->actual_length, data);
 
                if (bytes_sent + 2 > urb->actual_length) {
                        dbg("%s - trying to read more data than available"
@@ -1046,7 +1051,11 @@ MODULE_DESCRIPTION( DRIVER_DESC );
 MODULE_LICENSE("GPL"); 
 
 
-module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM(debug, "i");
 MODULE_PARM_DESC(debug, "enable extensive debugging messages");
+/* FIXME: implement
+MODULE_PARM(num_urbs, "i");
+MODULE_PARM_DESC(num_urbs, "number of URBs to use in write pool");
+*/
 
 /* vim: set sts=8 ts=8 sw=8: */