| From 191252837626fca0de694c18bb2aa64c118eda89 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Wed, 29 Oct 2014 09:07:30 +0100 |
| Subject: USB: kobil_sct: fix non-atomic allocation in write path |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| commit 191252837626fca0de694c18bb2aa64c118eda89 upstream. |
| |
| Write may be called from interrupt context so make sure to use |
| GFP_ATOMIC for all allocations in write. |
| |
| Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/kobil_sct.c | 5 +++-- |
| 1 file changed, 3 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/usb/serial/kobil_sct.c |
| +++ b/drivers/usb/serial/kobil_sct.c |
| @@ -335,7 +335,8 @@ static int kobil_write(struct tty_struct |
| port->interrupt_out_urb->transfer_buffer_length = length; |
| |
| priv->cur_pos = priv->cur_pos + length; |
| - result = usb_submit_urb(port->interrupt_out_urb, GFP_NOIO); |
| + result = usb_submit_urb(port->interrupt_out_urb, |
| + GFP_ATOMIC); |
| dev_dbg(&port->dev, "%s - Send write URB returns: %i\n", __func__, result); |
| todo = priv->filled - priv->cur_pos; |
| |
| @@ -350,7 +351,7 @@ static int kobil_write(struct tty_struct |
| if (priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID || |
| priv->device_type == KOBIL_ADAPTER_K_PRODUCT_ID) { |
| result = usb_submit_urb(port->interrupt_in_urb, |
| - GFP_NOIO); |
| + GFP_ATOMIC); |
| dev_dbg(&port->dev, "%s - Send read URB returns: %i\n", __func__, result); |
| } |
| } |
