Commit 54d0a3ab authored by Johan Hovold's avatar Johan Hovold

USB: serial: iuu_phoenix: fix DMA from stack

Stack-allocated buffers cannot be used for DMA (on all architectures) so
allocate the flush command buffer using kmalloc().

Fixes: 60a8fc01 ("USB: add iuu_phoenix driver")
Cc: stable <stable@vger.kernel.org>     # 2.6.25
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 0e2d6795
...@@ -532,23 +532,29 @@ static int iuu_uart_flush(struct usb_serial_port *port) ...@@ -532,23 +532,29 @@ static int iuu_uart_flush(struct usb_serial_port *port)
struct device *dev = &port->dev; struct device *dev = &port->dev;
int i; int i;
int status; int status;
u8 rxcmd = IUU_UART_RX; u8 *rxcmd;
struct iuu_private *priv = usb_get_serial_port_data(port); struct iuu_private *priv = usb_get_serial_port_data(port);
if (iuu_led(port, 0xF000, 0, 0, 0xFF) < 0) if (iuu_led(port, 0xF000, 0, 0, 0xFF) < 0)
return -EIO; return -EIO;
rxcmd = kmalloc(1, GFP_KERNEL);
if (!rxcmd)
return -ENOMEM;
rxcmd[0] = IUU_UART_RX;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
status = bulk_immediate(port, &rxcmd, 1); status = bulk_immediate(port, rxcmd, 1);
if (status != IUU_OPERATION_OK) { if (status != IUU_OPERATION_OK) {
dev_dbg(dev, "%s - uart_flush_write error\n", __func__); dev_dbg(dev, "%s - uart_flush_write error\n", __func__);
return status; goto out_free;
} }
status = read_immediate(port, &priv->len, 1); status = read_immediate(port, &priv->len, 1);
if (status != IUU_OPERATION_OK) { if (status != IUU_OPERATION_OK) {
dev_dbg(dev, "%s - uart_flush_read error\n", __func__); dev_dbg(dev, "%s - uart_flush_read error\n", __func__);
return status; goto out_free;
} }
if (priv->len > 0) { if (priv->len > 0) {
...@@ -556,12 +562,16 @@ static int iuu_uart_flush(struct usb_serial_port *port) ...@@ -556,12 +562,16 @@ static int iuu_uart_flush(struct usb_serial_port *port)
status = read_immediate(port, priv->buf, priv->len); status = read_immediate(port, priv->buf, priv->len);
if (status != IUU_OPERATION_OK) { if (status != IUU_OPERATION_OK) {
dev_dbg(dev, "%s - uart_flush_read error\n", __func__); dev_dbg(dev, "%s - uart_flush_read error\n", __func__);
return status; goto out_free;
} }
} }
} }
dev_dbg(dev, "%s - uart_flush_read OK!\n", __func__); dev_dbg(dev, "%s - uart_flush_read OK!\n", __func__);
iuu_led(port, 0, 0xF000, 0, 0xFF); iuu_led(port, 0, 0xF000, 0, 0xFF);
out_free:
kfree(rxcmd);
return status; return status;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment