From patchwork Thu Aug 26 15:36:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 502879 Delivered-To: patch@linaro.org Received: by 2002:a17:906:f46:0:0:0:0 with SMTP id h6csp310694ejj; Thu, 26 Aug 2021 08:25:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXgu20iGzk+m7vuzPfhi4i3OyAStkglOcFlKf0fgIOh05FntJ4/3EJqMuBe2b+Wo6Zof2R X-Received: by 2002:a17:906:c006:: with SMTP id e6mr4940468ejz.510.1629991518389; Thu, 26 Aug 2021 08:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629991518; cv=none; d=google.com; s=arc-20160816; b=NldbatkTpN5I+rhxIFd/CJrKA9cm8nU7Cjwgw5RQeLZfHYmcx3iALSMVU+RoIipW3Z YbHUCiT1uIHCaXBLHPmiqpGqKQfGhOweQUyrBeXfhbwM8QxZ20w4rGbJQv0mZf2mNwPM 6BCJc88rF4+hHjLst+V+O/2CK3eIFxsiV1W6Nz2TM3CCZdkl1vH1/eLL5UeU6B3fXLsw MBmLcTDE2UpFE1VFJH1yP6X+tgkBPl9JsaxQrdGxRaorZb1/JoIeLjELnjgxTXNf/Kx4 mfmXQbSqZvDsW3KJjnZqSjbAHI2tsY2EdN9LNTR0GUEP023YRBa9RoSrCEsv+UdbTXPL /DKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=U0QqVHJil6l5G4MYVgLkmExnYXL2IJoOnCLaNmNVQZ4=; b=j+UZYQneEVb2DhyMthI/Aj/9sURo2XhDis1rla1ESix4Vp3Y+v6TQhxhML1MwDhp/I jgRjAqoGoZKqjQHlsdtZavIKPV3NfMIkVAob+Skl1hEZQRiSIjvByG0CoXT5ZZfxk7FS uMLUgbZPtZgI/Di8nhe/WgVu3jB4tcxOOF20aXKeKW2KKL/Q7mWJ06lvogbOLfyZB3ar fY6Qibb6Z1q7mXC5QEvAaSD2/dZ6Z87SbbzKopdty4OGXsekd8ofU/T4ropKqzJjwyJA hD1HU+p5lbcNe8FqX1NfPMos5uK5hcsBR9f0tI10PhL5W3CKijCiE1Ld7xM/f86gV2e/ yzNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YrLaZGkZ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b18si3312241ejh.638.2021.08.26.08.25.18; Thu, 26 Aug 2021 08:25:18 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YrLaZGkZ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242966AbhHZP0E (ORCPT + 8 others); Thu, 26 Aug 2021 11:26:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242958AbhHZP0B (ORCPT ); Thu, 26 Aug 2021 11:26:01 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AB2EC0613CF for ; Thu, 26 Aug 2021 08:25:14 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id n5so5634098wro.12 for ; Thu, 26 Aug 2021 08:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=U0QqVHJil6l5G4MYVgLkmExnYXL2IJoOnCLaNmNVQZ4=; b=YrLaZGkZomL/VSUIB7k1uAoRcfuyNKijVQMEVfIkyLwLKsJ7OoEgXUUwhmAdOsGocG mGmJx3NbIIXqCrQGRljw64436tbdrUm4rvu0CoFFen5jpgl7EpofhsO63PJ/wlPptUwN +mp8oWVWvtOD69snQtOHyVJVqWQk0v2M9GklYJXZ4Rhbkj97WCDNEPNhOHBNdbrfc1IQ LYOroLdqo+nwZlDg9axMJuehHk7g2604sMuvagEjPp23LyQwAmBjKQ4sisW36t7B1stI Qm4npQuOBOptI1rXsPhWCW0QLJzDgFnRSrXKsf32dqgzcz+BPFq5Bzr0acXB/TMjr/Ad LCIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=U0QqVHJil6l5G4MYVgLkmExnYXL2IJoOnCLaNmNVQZ4=; b=h3nJj51TccGXiD5XHxcjfoRoa2TGALf3brCcgTTV+7De26rB3ENbT+rICos17/ggty PGHxOwHcosmehIgISS6CC7r3j5dqh8wMwj91cJ5w05FfsRHxpFCAv8hkP3v7pieLXvmJ bZeFwJDRGl3cn0FQzvr3/97+hjvHc/Qr9UpEIrG2/U6jqA22ZVBNUIok0mtBXHmCf7K5 FDdW2/TfzhXd6Aw6iDU2oq+b4stCRddDc17dTGE7kHOe/naWicinpiQ5opag/3ox+/UE 6t/3Ax6Ji2uXuCC0Ez47a0NJy7dQFs/ZoXMX1mBi07MNX9OdM8DKynYCxK3z7j1TaO1K tzwQ== X-Gm-Message-State: AOAM532DafREtSCWKRzD/AIf6bscZPfczq78UhnQD8SH+Byg5cwsKZfG 7BlXiMw/Y4Je9cfBflrYmxIERw== X-Received: by 2002:adf:dc0b:: with SMTP id t11mr4550735wri.259.1629991512717; Thu, 26 Aug 2021 08:25:12 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:82c:5f0:edf4:979b:2385:1df8]) by smtp.gmail.com with ESMTPSA id t11sm3263949wmi.23.2021.08.26.08.25.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 08:25:12 -0700 (PDT) From: Loic Poulain To: kuba@kernel.org, kvalo@codeaurora.org, davem@davemloft.net Cc: netdev@vger.kernel.org, ath11k@lists.infradead.org, regressions@lists.linux.dev, hemantk@codeaurora.org, nschichan@freebox.fr, manivannan.sadhasivam@linaro.org, Loic Poulain Subject: [PATCH] qrtr: mhi: Fix duplicate channel start Date: Thu, 26 Aug 2021 17:36:03 +0200 Message-Id: <1629992163-6252-1-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit ce78ffa3ef16 ("net: really fix the build...") handling a merge conflict causes the mhi_prepare_for_transfer() function to be called twice (with different flags), leading to QRTR probing issues. Fixes: ce78ffa3ef16 ("net: really fix the build...") Signed-off-by: Loic Poulain --- net/qrtr/mhi.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.7.4 diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c index 1dc955c..deb8b03 100644 --- a/net/qrtr/mhi.c +++ b/net/qrtr/mhi.c @@ -83,11 +83,6 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev, struct qrtr_mhi_dev *qdev; int rc; - /* start channels */ - rc = mhi_prepare_for_transfer(mhi_dev, 0); - if (rc) - return rc; - qdev = devm_kzalloc(&mhi_dev->dev, sizeof(*qdev), GFP_KERNEL); if (!qdev) return -ENOMEM;