From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 May 2022 13:39:23 +0000 (+0200)
Subject: Merge 5.18-rc7 into usb-next
X-Git-Tag: v6.6.17~7347^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6da35e0c6d50f76eaf11a0496d3d2ec1a1fea3f;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.18-rc7 into usb-next

We need the tty fixes in here as well, as we need to revert one of them :(

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

d6da35e0c6d50f76eaf11a0496d3d2ec1a1fea3f
diff --cc drivers/tty/serial/fsl_lpuart.c
index 75b3c36,be12fee..7b46b97
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@@ -2739,8 -2780,11 +2740,7 @@@ failed_get_rs485
  failed_reset:
  	uart_remove_one_port(&lpuart_reg, &sport->port);
  failed_attach_port:
- failed_irq_request:
  	lpuart_disable_clks(sport);
 -failed_clock_enable:
 -failed_out_of_range:
 -	if (sport->id_allocated)
 -		ida_simple_remove(&fsl_lpuart_ida, sport->port.line);
  	return ret;
  }