[PATCH-stable] serial: samsung: Bring back removed variable to fix compilation

[PATCH-stable] serial: samsung: Bring back removed variable to fix compilation

[Krzysztof Kozlowski]

By mistake commit 500fcc08a32b ("serial: samsung: Add missing checks for
dma_map_single failure") removes a local variable which is still used by
code.  After backporting the commit to stable, compilation fails:

	drivers/tty/serial/samsung.c: In function ‘s3c24xx_serial_request_dma’:
	drivers/tty/serial/samsung.c:909:45: error: ‘flags’ undeclared (first use in this function)

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Fix for stable-rc commit:
bc3ac2299c4873cdc7f9bf3c867c23e9714a036f
---
 drivers/tty/serial/samsung.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index ca0bcd7fd61f..43c84c9bb904 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -859,6 +859,7 @@ static void s3c24xx_serial_break_ctl(struct uart_port *port, int break_state)
 static int s3c24xx_serial_request_dma(struct s3c24xx_uart_port *p)
 {
 	struct s3c24xx_uart_dma	*dma = p->dma;
+	unsigned long flags;
 	int ret;
 
 	/* Default slave configuration parameters */
-- 
2.7.4

Re: [PATCH-stable] serial: samsung: Bring back removed variable to fix compilation

[Krzysztof Kozlowski]

On Thu, May 18, 2017 at 2:31 PM, Krzysztof Kozlowski
<kozik.server@gmail.com> wrote:

I need to fixup the from field. It should be krzk@kernel.org.

Krzysztof


> By mistake commit 500fcc08a32b ("serial: samsung: Add missing checks for
> dma_map_single failure") removes a local variable which is still used by
> code.  After backporting the commit to stable, compilation fails:
>
>         drivers/tty/serial/samsung.c: In function ‘s3c24xx_serial_request_dma’:
>         drivers/tty/serial/samsung.c:909:45: error: ‘flags’ undeclared (first use in this function)
>
> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
>
> ---
>
> Fix for stable-rc commit:
> bc3ac2299c4873cdc7f9bf3c867c23e9714a036f
> ---
>  drivers/tty/serial/samsung.c | 1 +
>  1 file changed, 1 insertion(+)

Re: [PATCH-stable] serial: samsung: Bring back removed variable to fix compilation

[Greg Kroah-Hartman]

On Thu, May 18, 2017 at 02:59:32PM +0200, Krzysztof Kozlowski wrote:
> On Thu, May 18, 2017 at 2:31 PM, Krzysztof Kozlowski
> <kozik.server@gmail.com> wrote:
> 
> I need to fixup the from field. It should be krzk@kernel.org.

I've merged this with the original patch so nothing breaks...

thanks,

greg k-h

Re: [PATCH-stable] serial: samsung: Bring back removed variable to fix compilation

[Krzysztof Kozlowski]

On Thu, May 18, 2017 at 3:14 PM, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
> On Thu, May 18, 2017 at 02:59:32PM +0200, Krzysztof Kozlowski wrote:
>> On Thu, May 18, 2017 at 2:31 PM, Krzysztof Kozlowski
>> <kozik.server@gmail.com> wrote:
>>
>> I need to fixup the from field. It should be krzk@kernel.org.
>
> I've merged this with the original patch so nothing breaks...

Great, thanks!

Krzysztof