Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2258100ybg; Sun, 27 Oct 2019 14:34:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqzbz2SLxyuG7VXAVWfnv4NkB/TpgiSy9oMsgY7YOt2H1GEdsH4H3uNltArVjRoj/kWHPJMy X-Received: by 2002:a50:eb92:: with SMTP id y18mr14790383edr.244.1572212052495; Sun, 27 Oct 2019 14:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572212052; cv=none; d=google.com; s=arc-20160816; b=JaWMSLL+KWPFG6DRip33SJALTxcytYlZLyX5J1eJudDb7nJfjCleP1L5zdXKist6P0 ifK+L9Bz/3RNl8ixI2PKCBGDIWC+mCMILIRdU5V2r1LNodLlkZV1a/Q8EcwbppG8GPLh JqpDHTIJPIoFo20jZr+ByxNg1GzO06u4OEQ1qDx2WW58XLHDTXmROP90OkBtqXSB9K/4 74KoPd8ErwN30tZMfOYa4KTXsaPaysBSixZvEdyzrtJWcP7QPewyHGGq7jucaw4PLjEw pFparQhYdC0DNQBlOE66GrwQ3OwR0TpOdPW8RkK/4zK1NE2fEHHxY7yJE8vgztPB/Ks+ 9buQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3O+cCzdCM9575jYdWUWEIwHuQFbvoIiaFOfWB+RXJNw=; b=oLz53JgPFeqJjBm7t/FIrvmERj+qJmzZ7VSUZjlW72RRrrZHCYpucjz3go7kEJIBj8 HRn3CCL4ClyLpJAqITZSmXWmfYkADoE5yb+OXtA/1q03mTICUwjJ7lE11NwezCNpUPSi CLxLchRKyVVR62oIzbMQVn0WIqljgop1GFOHQazZrTfFBwyx8Hup8WAiUDDPntViZtfS obiLHtUt2+9370yCtwV14Ap2kUx3w4A228/HfA3rsDUFmJdMx3jSuYPjzaDMBjEt7Q0w Pq1ve/QxU1frocWAFQopwEpaAr6t2Sw3/SuFax53UcZVY4bcRkZiJcC9r5syQ3jCs7fr i6Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jGtdA1w2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n27si5241863ejh.342.2019.10.27.14.33.49; Sun, 27 Oct 2019 14:34:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jGtdA1w2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731371AbfJ0VS6 (ORCPT + 99 others); Sun, 27 Oct 2019 17:18:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:39082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731336AbfJ0VSv (ORCPT ); Sun, 27 Oct 2019 17:18:51 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 09B8921848; Sun, 27 Oct 2019 21:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211128; bh=WTkKy8s4ac7duYl64OPSqQAgvDeJDiVxDqId02GUUs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jGtdA1w2zUleEk7jMjxFH51717AQu6/pJoayI2Fnw+Qh+Th7wFhMPPVelOA8tDSRG fe7xPALIB1p+TZoQsKtHCvUhE3LU5Drh6VBMLcNt79vQ0cnYANumx7p/tqE6qdaOcm SJ+C5a64E0pL+cF0/g+I/6iIWiQ1sPcHxS4BJqkQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiang Chen , John Garry , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.3 007/197] scsi: megaraid: disable device when probe failed after enabled device Date: Sun, 27 Oct 2019 21:58:45 +0100 Message-Id: <20191027203352.083484397@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen [ Upstream commit 70054aa39a013fa52eff432f2223b8bd5c0048f8 ] For pci device, need to disable device when probe failed after enabled device. Link: https://lore.kernel.org/r/1567818450-173315-1-git-send-email-chenxiang66@hisilicon.com Signed-off-by: Xiang Chen Reviewed-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/megaraid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 45a66048801be..ff6d4aa924213 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -4183,11 +4183,11 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) */ if (pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ && pdev->subsystem_device == 0xC000) - return -ENODEV; + goto out_disable_device; /* Now check the magic signature byte */ pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic); if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE) - return -ENODEV; + goto out_disable_device; /* Ok it is probably a megaraid */ } -- 2.20.1