git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[pandora-kernel.git]
/
drivers
/
usb
/
serial
/
mos7720.c
diff --git
a/drivers/usb/serial/mos7720.c
b/drivers/usb/serial/mos7720.c
index
82cd15b
..
e55f4ed
100644
(file)
--- a/
drivers/usb/serial/mos7720.c
+++ b/
drivers/usb/serial/mos7720.c
@@
-363,7
+363,7
@@
static int mos7720_open(struct usb_serial_port *port, struct file * filp)
/* Initialising the write urb pool */
for (j = 0; j < NUM_URBS; ++j) {
/* Initialising the write urb pool */
for (j = 0; j < NUM_URBS; ++j) {
- urb = usb_alloc_urb(0,
SLAB
_ATOMIC);
+ urb = usb_alloc_urb(0,
GFP
_ATOMIC);
mos7720_port->write_urb_pool[j] = urb;
if (urb == NULL) {
mos7720_port->write_urb_pool[j] = urb;
if (urb == NULL) {
@@
-1014,7
+1014,7
@@
static int send_cmd_write_baud_rate(struct moschip_port *mos7720_port,
* the specified new settings.
*/
static void change_port_settings(struct moschip_port *mos7720_port,
* the specified new settings.
*/
static void change_port_settings(struct moschip_port *mos7720_port,
- struct termios *old_termios)
+ struct
k
termios *old_termios)
{
struct usb_serial_port *port;
struct usb_serial *serial;
{
struct usb_serial_port *port;
struct usb_serial *serial;
@@
-1203,7
+1203,7
@@
static void change_port_settings(struct moschip_port *mos7720_port,
* termios structure.
*/
static void mos7720_set_termios(struct usb_serial_port *port,
* termios structure.
*/
static void mos7720_set_termios(struct usb_serial_port *port,
- struct termios *old_termios)
+ struct
k
termios *old_termios)
{
int status;
unsigned int cflag;
{
int status;
unsigned int cflag;