git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
empeg.c
diff --git
a/drivers/usb/serial/empeg.c
b/drivers/usb/serial/empeg.c
index
677b31f
..
251a50f
100644
(file)
--- a/
drivers/usb/serial/empeg.c
+++ b/
drivers/usb/serial/empeg.c
@@
-63,15
+63,10
@@
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
#include <linux/spinlock.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 "usb-serial.h"
+static int debug;
+
/*
* Version Information
*/
/*
* Version Information
*/
@@
-249,7
+244,7
@@
static int empeg_write (struct usb_serial_port *port, int from_user, const unsig
memcpy (urb->transfer_buffer, current_position, transfer_size);
}
memcpy (urb->transfer_buffer, current_position, transfer_size);
}
- usb_serial_debug_data
(__FILE__
, __FUNCTION__, transfer_size, urb->transfer_buffer);
+ usb_serial_debug_data
(debug, &port->dev
, __FUNCTION__, transfer_size, urb->transfer_buffer);
/* build up our urb */
usb_fill_bulk_urb (
/* build up our urb */
usb_fill_bulk_urb (
@@
-365,7
+360,7
@@
static void empeg_read_bulk_callback (struct urb *urb, struct pt_regs *regs)
return;
}
return;
}
- usb_serial_debug_data
(__FILE__
, __FUNCTION__, urb->actual_length, data);
+ usb_serial_debug_data
(debug, &port->dev
, __FUNCTION__, urb->actual_length, data);
tty = port->tty;
tty = port->tty;
@@
-521,11
+516,7
@@
static void empeg_set_termios (struct usb_serial_port *port, struct termios *old
*/
port->tty->low_latency = 1;
*/
port->tty->low_latency = 1;
- /* Notify the tty driver that the termios have changed. */
- port->tty->ldisc.set_termios(port->tty, NULL);
-
return;
return;
-
}
}
@@
-609,6
+600,5
@@
MODULE_AUTHOR( DRIVER_AUTHOR );
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION( DRIVER_DESC );
MODULE_LICENSE("GPL");
-
MODULE_PARM(debug, "i"
);
+
module_param(debug, bool, S_IRUGO | S_IWUSR
);
MODULE_PARM_DESC(debug, "Debug enabled or not");
MODULE_PARM_DESC(debug, "Debug enabled or not");
-