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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
safe_serial.c
diff --git
a/drivers/usb/serial/safe_serial.c
b/drivers/usb/serial/safe_serial.c
index
1e07dfa
..
f0215f8
100644
(file)
--- a/
drivers/usb/serial/safe_serial.c
+++ b/
drivers/usb/serial/safe_serial.c
@@
-60,6
+60,7
@@
*/
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/init.h>
@@
-71,7
+72,7
@@
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h>
#include <linux/usb.h>
-#include
<linux/usb/serial.h>
+#include
"usb-serial.h"
#ifndef CONFIG_USB_SAFE_PADDED
#ifndef CONFIG_USB_SAFE_PADDED
@@
-298,14
+299,14
@@
static int safe_write (struct usb_serial_port *port, const unsigned char *buf, i
dbg ("%s - write request of 0 bytes", __FUNCTION__);
return (0);
}
dbg ("%s - write request of 0 bytes", __FUNCTION__);
return (0);
}
- spin_lock
_bh
(&port->lock);
+ spin_lock(&port->lock);
if (port->write_urb_busy) {
if (port->write_urb_busy) {
- spin_unlock
_bh
(&port->lock);
+ spin_unlock(&port->lock);
dbg("%s - already writing", __FUNCTION__);
return 0;
}
port->write_urb_busy = 1;
dbg("%s - already writing", __FUNCTION__);
return 0;
}
port->write_urb_busy = 1;
- spin_unlock
_bh
(&port->lock);
+ spin_unlock(&port->lock);
packet_length = port->bulk_out_size; // get max packetsize
packet_length = port->bulk_out_size; // get max packetsize