From patchwork Mon Jan 23 17:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 47281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1738816wrn; Mon, 23 Jan 2023 09:58:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXsv6SO0zCIm1EX+y9xCrIKdD2/0bX/Z/cJB1o92On6ybkRA/5aPyASKHBKO/HIYvf/y0wkK X-Received: by 2002:aa7:cc81:0:b0:47e:eaae:9a5b with SMTP id p1-20020aa7cc81000000b0047eeaae9a5bmr24945197edt.42.1674496697259; Mon, 23 Jan 2023 09:58:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674496697; cv=none; d=google.com; s=arc-20160816; b=Fx9Ff79BqsItPTc0ps6wZYJMovEhcOhTzKJqXHviEt7elvXfvLp+PxuEXHd8GGloo4 HJEyQZLTExZotHmHrhuu+bEItIoG7TE4SXjmEfa19CzFIIoIdjXs78CypW0ua9lnanjD RyAC8z7zCBqlJm5sgPVK9PK7NKoldFdlSz2SsWYTjxRzR72pSiVp/4obmAqFouOcq2kr 6uC6L60FcLWMgMsGtML3IS2sJQ6982SUj2KZzrpdtS4ZAu3uDCaXh5o75ANKzkrsacsg 8aOTEfiZpl0cnWQekXcMUDf61cQlD6Byj2Usb4+ByXnV9YK8eB9tOum400p8Wo29vjuR 7nfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T4GcWionnGbd6ohpNx0B3kC9Dsumq693voNx2HHMfSk=; b=J2Ay6ZE8Z3HzlbfFgdrbn75TY18s5pb+Z1YP3y+4tqxmg3Kx/QIPZS0YWGRHAAjTQs ljnU7J0GHUu8jPaYmpCIoNRDzhs80b+USRnuP4jJ4BHGgH+Kim91kd/zuwQrI1WkCjat J9Z+i2UfWfQcXZ4gkUOuE0f/AOP7Yc0bgv+7SEDlN1BDEeoEH4me363XXftqp6Z/LIaL ODeFEzyxqHGyveE4vOfN57tGk9RXVUyqPts8NI3S0okfRHYXLsqJhs7o2SkpvLG83u4w tOVMqF22jne/gwvX+l/exNa+NaxVDXF3sBymo/ajH3uHDbinBNJlSiRqno9g4Q+F6xJM vlhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OkXdA03C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bq3-20020a056402214300b0046b2327bf88si23238edb.76.2023.01.23.09.57.53; Mon, 23 Jan 2023 09:58:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OkXdA03C; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230357AbjAWRjQ (ORCPT + 99 others); Mon, 23 Jan 2023 12:39:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232041AbjAWRjO (ORCPT ); Mon, 23 Jan 2023 12:39:14 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA36229157; Mon, 23 Jan 2023 09:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674495552; x=1706031552; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5LNho4sfT75NePcn4eH8u+6snEN8uGq86xx6e7f3JM4=; b=OkXdA03C8U+SdjVrMvao70Bayq6rFilxKXFzR5+LqMO0VuiiAdnvTQ7e bp1tsKAF1VCk/xgf+lryF8TQBiHBev+q5Tcpqk3CwDBq7xpGTh//rLNGh Exl/+KB+3v2OM+r2XApsiNE8yC0t96elv5jWxXfbQh5Galim19Q3jflMx m5QOXIDTnrIFsGvr58Icw363ogXqdyO0YrDOafF7CJlGgIUS+qB4ZFAUg qUa/ddR7kVqfnAw/zFQcrETWVMTI1HLIhcIT1lqftTinQoPcFFF1agevp aLrhkwY941e3KcHN0hn6Pu79IWPlnR6eW2reCTv5K41iI0Pj4ILMQtxu4 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="390601978" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="390601978" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 09:39:12 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="694017767" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="694017767" Received: from giangiac-mobl1.amr.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.249.47.71]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 09:39:09 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Greg Kroah-Hartman , linux-serial@vger.kernel.org, Jiri Slaby , Andy Gross , Bjorn Andersson , Konrad Dybcio , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Ilpo_J=C3=A4rvinen?= Subject: [PATCH 1/2] serial: qcom_geni: Fix variable naming Date: Mon, 23 Jan 2023 19:38:56 +0200 Message-Id: <20230123173857.40695-2-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173857.40695-1-ilpo.jarvinen@linux.intel.com> References: <20230123173857.40695-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837048428893524?= X-GMAIL-MSGID: =?utf-8?q?1755837048428893524?= Commit 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for serial engine DMA") renamed rx_fifo member to rf_buf which caused a build failure when b8caf69a6946 ("tty: serial: qcom-geni-serial: fix slab-out-of-bounds on RX FIFO buffer") from tty-linus was merged into tty-next. Fix the member variable name. Fixes: 7a6aa989f2e8 ("Merge 6.2-rc5 into tty-next") Signed-off-by: Ilpo Järvinen --- drivers/tty/serial/qcom_geni_serial.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index d98e0a8aae7c..7c49194ec8ac 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1055,11 +1055,11 @@ static int setup_fifos(struct qcom_geni_serial_port *port) uport->fifosize = (port->tx_fifo_depth * port->tx_fifo_width) / BITS_PER_BYTE; - if (port->rx_fifo && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) { - port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo, - port->rx_fifo_depth * sizeof(u32), - GFP_KERNEL); - if (!port->rx_fifo) + if (port->rx_buf && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) { + port->rx_buf = devm_krealloc(uport->dev, port->rx_buf, + port->rx_fifo_depth * sizeof(u32), + GFP_KERNEL); + if (!port->rx_buf) return -ENOMEM; } From patchwork Mon Jan 23 17:38:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ilpo_J=C3=A4rvinen?= X-Patchwork-Id: 47282 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1739131wrn; Mon, 23 Jan 2023 09:59:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXv3B4wjIpflBkHS+L7pF7xtnnCMBagqifR0FobfSd9oUOwJzZirK39eS64Sdti/uGywKKvM X-Received: by 2002:a17:906:1918:b0:7ad:ca80:5669 with SMTP id a24-20020a170906191800b007adca805669mr27857501eje.64.1674496743025; Mon, 23 Jan 2023 09:59:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674496743; cv=none; d=google.com; s=arc-20160816; b=VIB8B+2S024xYG5YAPckQoqYDgi5lLMQQIFeZtCAWC1MY+EeNoKzYx475yX4Ch5JSU 4mvmnvC4bb/uYyltwOgZemp39D6xb9Z/5BWS1PeF9cLXyqHRWCfXmmxzzSOuK4z4l1RG iBbmfTLUM5RocPOeebDpZOLTW9m+x0PSmUHJfJut2jdJCZPiDs346PQhvuW9gwGHod15 egO+1qRAvITwZnTA0t/U7/tE/up6n8LW4bBQzxmVesap92U1rNrHx0M8MC8yVbM5vf31 F7LbjsfrYM2I9Ya3ZdN/8EgVjLjOBrjfp75kV/vsHgeMdowm3wGQ4NC1B5/uvMtVcH9q KVTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0EBDOhXOzH5NXb05TsrByYqktBu+zzum1E9C5OGjEuc=; b=Lgf8N5SaGCf04lVmJcYw4x6oM81Nb5IumBO/spCGPoICjzsQSNetYCdq5LlYCyGUjn qbCzSwqk3FJlLRavid32nptUig4NPztEWY4nFeYflN7KxCg1WZmN4igke9GoW9lRqhi0 oc8ZeZJ2Z+VA8Scy7Ewmm+u0TbdQ2p3mnxKWbIcR/Fi17d31VnzxdFxkVqagCUQGhM00 C133HQxwJK3qRTZ7394TKpSdtg/g0zF4LxnNnRtBslgYYUEOXJEp2kKVaZ2saxe/gIIc oV+prVSFVwvVU016UsMYDC8RCR/9Myb5S5MtUkiUAyaBNfDb+dnIKQ+4lOvhGWnjabML 2f4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kSRRT1V7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y18-20020a056402359200b00461dc830100si36433209edc.452.2023.01.23.09.58.38; Mon, 23 Jan 2023 09:59:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=kSRRT1V7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232448AbjAWRjY (ORCPT + 99 others); Mon, 23 Jan 2023 12:39:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232299AbjAWRjT (ORCPT ); Mon, 23 Jan 2023 12:39:19 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE29C29423; Mon, 23 Jan 2023 09:39:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674495557; x=1706031557; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=72mROXM5bY+9TiTxvULVJ7CcWsGH/U7JStjakO0iwsI=; b=kSRRT1V7cZUbIySw8p/Fp9YzZIQr3RwrtlAZNMoWGIjNM6z3gmhHW+yT TlyRqv4QofPtKkLAz4fHTKiPaEkz09WEkhyGn/OlfgjSdQ3WPZlchli78 ZOJeZUgZHEWzKTmUMhNPlxOOsOsVNcs/ZhtFLLzitooZJZembdqu6PMUY L7KMoALWHjjAoMd2UFrPrORjpGDaE293IH6tVdvpLVCfVADvSBtTD3d9A mBktlIJAkyn1HbjcjwEWQ1gzigYq2fB4U5LyLkyXU0NqWEqc0Cv6ffPIC tZkbwfUSCD0bqjCd/6yQa86FFIPLzlsJXlEyrhwhuNCSHmwqVlnnfZ7Pt w==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="390601984" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="390601984" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 09:39:17 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="694017809" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="694017809" Received: from giangiac-mobl1.amr.corp.intel.com (HELO ijarvine-MOBL2.ger.corp.intel.com) ([10.249.47.71]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 09:39:14 -0800 From: =?utf-8?q?Ilpo_J=C3=A4rvinen?= To: Greg Kroah-Hartman , linux-serial@vger.kernel.org, Jiri Slaby , Karol Gugala , Mateusz Holenko , Gabriel Somlo , Joel Stanley , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , linux-kernel@vger.kernel.org Cc: kernel test robot , Dan Carpenter Subject: [PATCH 2/2] serial: liteuart: Correct error rollback Date: Mon, 23 Jan 2023 19:38:57 +0200 Message-Id: <20230123173857.40695-3-ilpo.jarvinen@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230123173857.40695-1-ilpo.jarvinen@linux.intel.com> References: <20230123173857.40695-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755837097005542089?= X-GMAIL-MSGID: =?utf-8?q?1755837097005542089?= Goto to the correct rollback label instead of directly returning. Fixes: 5602cf99dcdc ("serial: liteuart: add IRQ support for the RX path") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Ilpo Järvinen Reviewed-by: Gabriel Somlo --- drivers/tty/serial/liteuart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c index ef557d59e4c8..192ad681de35 100644 --- a/drivers/tty/serial/liteuart.c +++ b/drivers/tty/serial/liteuart.c @@ -313,7 +313,7 @@ static int liteuart_probe(struct platform_device *pdev) ret = platform_get_irq_optional(pdev, 0); if (ret < 0 && ret != -ENXIO) - return ret; + goto err_erase_id; if (ret > 0) port->irq = ret;