Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50029214 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-3.18-rc4' of... 

Merge tag 'usb-serial-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for v3.18-rc4

Two fixes of non-atomic allocations in write paths.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents f20531a9 e681286d

drivers/usb/serial/kobil_sct.c

+3 −2
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port, 
			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 *tty, struct usb_serial_port *port, 
		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);

		}

	}

drivers/usb/serial/opticon.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int opticon_write(struct tty_struct *tty, struct usb_serial_port *port, 


	/* The connected devices do not have a bulk write endpoint,

	 * to transmit data to de barcode device the control endpoint is used */

	dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_NOIO);

	dr = kmalloc(sizeof(struct usb_ctrlrequest), GFP_ATOMIC);

	if (!dr) {

		count = -ENOMEM;

		goto error_no_dr;