summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.de>2007-03-26 16:55:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2007-04-27 13:28:37 -0700
commitb19d402a3450bb2597d0c1b54f6139462a5f35ae (patch)
treed455b64d0afa9a34bb29cc9f2f0880de9da4542d
parent9f8b17e643fe6aa505629658445849397bda4e4f (diff)
downloadlinux-b19d402a3450bb2597d0c1b54f6139462a5f35ae.tar.bz2
USB: aircable cleanup
- proper endianness macros - scheduling in interrupt in error case Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Naranjo Manuel Francisco <naranjo.manuel@gmail.com>
-rw-r--r--drivers/usb/serial/aircable.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 11dad42c3c60..b675735bfbee 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -209,6 +209,7 @@ static void aircable_send(struct usb_serial_port *port)
int count, result;
struct aircable_private *priv = usb_get_serial_port_data(port);
unsigned char* buf;
+ u16 *dbuf;
dbg("%s - port %d", __FUNCTION__, port->number);
if (port->write_urb_busy)
return;
@@ -226,8 +227,8 @@ static void aircable_send(struct usb_serial_port *port)
buf[0] = TX_HEADER_0;
buf[1] = TX_HEADER_1;
- buf[2] = (unsigned char)count;
- buf[3] = (unsigned char)(count >> 8);
+ dbuf = (u16 *)&buf[2];
+ *dbuf = cpu_to_le16((u16)count);
serial_buf_get(priv->tx_buf,buf + HCI_HEADER_LENGTH, MAX_HCI_FRAMESIZE);
memcpy(port->write_urb->transfer_buffer, buf,
@@ -434,7 +435,7 @@ static void aircable_write_bulk_callback(struct urb *urb)
__FUNCTION__, urb->status);
port->write_urb->transfer_buffer_length = 1;
port->write_urb->dev = port->serial->dev;
- result = usb_submit_urb(port->write_urb, GFP_KERNEL);
+ result = usb_submit_urb(port->write_urb, GFP_ATOMIC);
if (result)
dev_err(&urb->dev->dev,
"%s - failed resubmitting write urb, error %d\n",