From patchwork Tue Apr 28 18:25:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 226859 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFEEBC83000 for ; Tue, 28 Apr 2020 18:44:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A43C0206D6 for ; Tue, 28 Apr 2020 18:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099466; bh=+G9A+d2urEBIekAyzOxxilb6lylUKvI/JDvwZcFpwQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ve+/Nb4k3wM3bgz1WGlSFRspWxGaVnvr/jFzB964o8IkpMEirBj9NyDHdrgR95bj1 NUtZvDXRAq0sEVOV+uEds0ahvhnr9wv227uai+IE09n+5Pcug9WpqfUHBC/nHslXV4 7Ynvoxj8km/q8lhX0Nqhitg1d0ywmMBfxUZPmXjs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730494AbgD1SoZ (ORCPT ); Tue, 28 Apr 2020 14:44:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:37316 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731417AbgD1SoW (ORCPT ); Tue, 28 Apr 2020 14:44:22 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C73720575; Tue, 28 Apr 2020 18:44:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099462; bh=+G9A+d2urEBIekAyzOxxilb6lylUKvI/JDvwZcFpwQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cbWFwUnOipgcaNmPOQcNnoDBjwpGtPmTMVPfRs1xMW0hX4tsHwGrH4IecaCgVUQWi YhBimoMleNSIQtWeCmF8/ghkJ5/rQZ8/QZoLAar5bCPX2+CQ2qz9zDJVpQIpYs5v0/ ARUiwTG1zj/Fw38l8AjCpbUAA4QGP5tbLQ5mHD/E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Michal Simek Subject: [PATCH 5.4 160/168] Revert "serial: uartps: Fix error path when alloc failed" Date: Tue, 28 Apr 2020 20:25:34 +0200 Message-Id: <20200428182251.244690387@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michal Simek commit b6fd2dbbd649b89a3998528994665ded1e3fbf7f upstream. This reverts commit 32cf21ac4edd6c0d5b9614368a83bcdc68acb031. As Johan says, this driver needs a lot more work and these changes are only going in the wrong direction: https://lkml.kernel.org/r/20190523091839.GC568@localhost Reported-by: Johan Hovold Signed-off-by: Michal Simek Cc: stable Link: https://lore.kernel.org/r/46cd7f039db847c08baa6508edd7854f7c8ff80f.1585905873.git.michal.simek@xilinx.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/xilinx_uartps.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1528,10 +1528,8 @@ static int cdns_uart_probe(struct platfo #ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE cdns_uart_console = devm_kzalloc(&pdev->dev, sizeof(*cdns_uart_console), GFP_KERNEL); - if (!cdns_uart_console) { - rc = -ENOMEM; - goto err_out_id; - } + if (!cdns_uart_console) + return -ENOMEM; strncpy(cdns_uart_console->name, CDNS_UART_TTY_NAME, sizeof(cdns_uart_console->name));