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

Commit 1dbd11be authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: mos7720: replace unnecessary atomic allocations



Use GFP_KERNEL instead of GFP_ATOMIC for allocations in set_termios and
port-setting helper which both may and do sleep.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 811c3707
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -1657,7 +1657,7 @@ static void change_port_settings(struct tty_struct *tty,
	write_mos_reg(serial, port_number, IER, 0x0c);
	write_mos_reg(serial, port_number, IER, 0x0c);


	if (port->read_urb->status != -EINPROGRESS) {
	if (port->read_urb->status != -EINPROGRESS) {
		status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
		status = usb_submit_urb(port->read_urb, GFP_KERNEL);
		if (status)
		if (status)
			dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status);
			dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status);
	}
	}
@@ -1702,7 +1702,7 @@ static void mos7720_set_termios(struct tty_struct *tty,
	change_port_settings(tty, mos7720_port, old_termios);
	change_port_settings(tty, mos7720_port, old_termios);


	if (port->read_urb->status != -EINPROGRESS) {
	if (port->read_urb->status != -EINPROGRESS) {
		status = usb_submit_urb(port->read_urb, GFP_ATOMIC);
		status = usb_submit_urb(port->read_urb, GFP_KERNEL);
		if (status)
		if (status)
			dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status);
			dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status);
	}
	}