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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
usb
/
serial
/
keyspan.c
diff --git
a/drivers/usb/serial/keyspan.c
b/drivers/usb/serial/keyspan.c
index
015ad6c
..
3b958e6
100644
(file)
--- a/
drivers/usb/serial/keyspan.c
+++ b/
drivers/usb/serial/keyspan.c
@@
-95,6
+95,7
@@
*/
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/jiffies.h>
#include <linux/errno.h>
@@
-107,7
+108,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"
#include "keyspan.h"
static int debug;
#include "keyspan.h"
static int debug;
@@
-480,7
+481,7
@@
static void usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs)
dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]);
if (port->open_count)
dbg ("%s - urb %d", __FUNCTION__, urb == p_priv->out_urbs[1]);
if (port->open_count)
-
usb_serial_port_softint(port
);
+
schedule_work(&port->work
);
}
static void usa26_inack_callback(struct urb *urb, struct pt_regs *regs)
}
static void usa26_inack_callback(struct urb *urb, struct pt_regs *regs)
@@
-2249,11
+2250,12
@@
static int keyspan_startup (struct usb_serial *serial)
}
/* Setup private data for serial driver */
}
/* Setup private data for serial driver */
- s_priv = k
z
alloc(sizeof(struct keyspan_serial_private), GFP_KERNEL);
+ s_priv = k
m
alloc(sizeof(struct keyspan_serial_private), GFP_KERNEL);
if (!s_priv) {
dbg("%s - kmalloc for keyspan_serial_private failed.", __FUNCTION__);
return -ENOMEM;
}
if (!s_priv) {
dbg("%s - kmalloc for keyspan_serial_private failed.", __FUNCTION__);
return -ENOMEM;
}
+ memset(s_priv, 0, sizeof(struct keyspan_serial_private));
s_priv->device_details = d_details;
usb_set_serial_data(serial, s_priv);
s_priv->device_details = d_details;
usb_set_serial_data(serial, s_priv);
@@
-2261,11
+2263,12
@@
static int keyspan_startup (struct usb_serial *serial)
/* Now setup per port private data */
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
/* Now setup per port private data */
for (i = 0; i < serial->num_ports; i++) {
port = serial->port[i];
- p_priv = k
z
alloc(sizeof(struct keyspan_port_private), GFP_KERNEL);
+ p_priv = k
m
alloc(sizeof(struct keyspan_port_private), GFP_KERNEL);
if (!p_priv) {
dbg("%s - kmalloc for keyspan_port_private (%d) failed!.", __FUNCTION__, i);
return (1);
}
if (!p_priv) {
dbg("%s - kmalloc for keyspan_port_private (%d) failed!.", __FUNCTION__, i);
return (1);
}
+ memset(p_priv, 0, sizeof(struct keyspan_port_private));
p_priv->device_details = d_details;
usb_set_serial_port_data(port, p_priv);
}
p_priv->device_details = d_details;
usb_set_serial_port_data(port, p_priv);
}