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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
generic.c
diff --git
a/drivers/usb/serial/generic.c
b/drivers/usb/serial/generic.c
index
476cda1
..
3604293
100644
(file)
--- a/
drivers/usb/serial/generic.c
+++ b/
drivers/usb/serial/generic.c
@@
-9,7
+9,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/slab.h>
@@
-18,8
+17,8
@@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/usb.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/usb.h>
+#include <linux/usb/serial.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-#include "usb-serial.h"
static int debug;
static int debug;
@@
-138,6
+137,7
@@
int usb_serial_generic_open (struct usb_serial_port *port, struct file *filp)
return result;
}
return result;
}
+EXPORT_SYMBOL_GPL(usb_serial_generic_open);
static void generic_cleanup (struct usb_serial_port *port)
{
static void generic_cleanup (struct usb_serial_port *port)
{
@@
-175,14
+175,14
@@
int usb_serial_generic_write(struct usb_serial_port *port, const unsigned char *
/* only do something if we have a bulk out endpoint */
if (serial->num_bulk_out) {
/* only do something if we have a bulk out endpoint */
if (serial->num_bulk_out) {
- spin_lock(&port->lock);
+ spin_lock
_bh
(&port->lock);
if (port->write_urb_busy) {
if (port->write_urb_busy) {
- spin_unlock(&port->lock);
+ spin_unlock
_bh
(&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(&port->lock);
+ spin_unlock
_bh
(&port->lock);
count = (count > port->bulk_out_size) ? port->bulk_out_size : count;
count = (count > port->bulk_out_size) ? port->bulk_out_size : count;
@@
-248,7
+248,7
@@
int usb_serial_generic_chars_in_buffer (struct usb_serial_port *port)
return (chars);
}
return (chars);
}
-void usb_serial_generic_read_bulk_callback (struct urb *urb
, struct pt_regs *regs
)
+void usb_serial_generic_read_bulk_callback (struct urb *urb)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct usb_serial *serial = port->serial;
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
struct usb_serial *serial = port->serial;
@@
-285,8
+285,9
@@
void usb_serial_generic_read_bulk_callback (struct urb *urb, struct pt_regs *reg
if (result)
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
}
if (result)
dev_err(&port->dev, "%s - failed resubmitting read urb, error %d\n", __FUNCTION__, result);
}
+EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback);
-void usb_serial_generic_write_bulk_callback (struct urb *urb
, struct pt_regs *regs
)
+void usb_serial_generic_write_bulk_callback (struct urb *urb)
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
{
struct usb_serial_port *port = (struct usb_serial_port *)urb->context;
@@
-298,9
+299,7
@@
void usb_serial_generic_write_bulk_callback (struct urb *urb, struct pt_regs *re
return;
}
return;
}
- usb_serial_port_softint((void *)port);
-
- schedule_work(&port->work);
+ usb_serial_port_softint(port);
}
EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);
}
EXPORT_SYMBOL_GPL(usb_serial_generic_write_bulk_callback);