From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S940678AbdEXPrV (ORCPT ); Wed, 24 May 2017 11:47:21 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:14909 "EHLO esa5.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759914AbdEXPrS (ORCPT ); Wed, 24 May 2017 11:47:18 -0400 X-IronPort-AV: E=Sophos;i="5.38,386,1491235200"; d="scan'208";a="20056940" From: Bart Van Assche To: "jthumshirn@suse.de" , "martin.petersen@oracle.com" CC: "linux-scsi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "himanshu.madhani@cavium.com" , "qla2xxx-upstream@qlogic.com" Subject: Re: [PATCH] qla2xxx: don't disable a not previously enabled PCI device Thread-Topic: [PATCH] qla2xxx: don't disable a not previously enabled PCI device Thread-Index: AQHS09QSnX10rKsYK0m4ZRfXTV2q76IDolwA Date: Wed, 24 May 2017 15:47:14 +0000 Message-ID: <1495640832.2823.5.camel@sandisk.com> References: <20170523145047.5020-1-jthumshirn@suse.de> In-Reply-To: <20170523145047.5020-1-jthumshirn@suse.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: suse.de; dkim=none (message not signed) header.d=none;suse.de; dmarc=none action=none header.from=sandisk.com; x-originating-ip: [63.163.107.100] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY1PR0401MB1535;7:9WlE/eNPMVnuXzhYjXcOETBQbZKcSrJAMzYaKb9H+2N37gxuQ4ea152XAkLhkNz+a/E2aT02smk9zzgTJtvJx5HuLyTltk0NsoesM/SJ4Ft1MTWdsI4P1K6Db372e53oarf8ORGVfYJ61OTTSX5qmgtEZHdLYWRHCGT2UiFEFmHh0xi5AoAxXJfe2xWF+Xor88nOLFshU9N9oPlN54iNPFczhi1MAyZSu0XkZF4v6SaWNsA/YZpqISBrqW9IQ0WwdazY0W5vxjJcKn/v4mlE3u0kjKCxbpbpwCVfS1mApFgyg5Z2gGkZw/HynmM3h4hdgkozB1ITTIBdBJFpffDRGg==;20:u8okE4JDE+qYYrSkCNTnpwXToEKnsy500ldvcPeD4kkdfEE1jftkTQNnE0E8Cz2MS7ZW5ytRormz7A/kmRVrdmjUGDlliGeyw58C5qRA5TjqnzGg/XlfOmxqYnCceqmXp5lVLDaSAw+2gOZ/3URO3vyDve3fhUd22tfSprVUxqY= x-ms-traffictypediagnostic: CY1PR0401MB1535: x-ms-office365-filtering-correlation-id: 83b1cb06-d2da-4d6f-71cc-08d4a2bc260d x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081);SRVR:CY1PR0401MB1535; wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(42932892334569); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148);SRVR:CY1PR0401MB1535;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0401MB1535; x-forefront-prvs: 031763BCAF x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(39450400003)(39400400002)(39860400002)(39850400002)(39410400002)(39840400002)(377424004)(24454002)(4326008)(77096006)(6486002)(99286003)(6436002)(54906002)(25786009)(6512007)(36756003)(6246003)(53936002)(2900100001)(38730400002)(6506006)(81166006)(8936002)(3846002)(102836003)(6116002)(478600001)(5660300001)(189998001)(7736002)(103116003)(2906002)(2950100002)(229853002)(3280700002)(76176999)(54356999)(3660700001)(50986999)(305945005)(8676002)(122556002)(66066001)(33646002)(72206003)(86362001);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR0401MB1535;H:CY1PR0401MB1536.namprd04.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-ID: <11CF7772D7D9AD4FB8A2E408B3240F7D@namprd04.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: sandisk.com X-MS-Exchange-CrossTenant-originalarrivaltime: 24 May 2017 15:47:14.0838 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0401MB1535 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v4OFmVwp032507 On Tue, 2017-05-23 at 16:50 +0200, Johannes Thumshirn wrote: > When pci_enable_device() or pci_enable_device_mem() fail in > qla2x00_probe_one() we bail out but do a call to > pci_disable_device(). This causes the dev_WARN_ON() in > pci_disable_device() to trigger, as the device wasn't enabled > previously. > > So instead of taking the 'probe_out' error path we can directly return > *iff* one of the pci_enable_device() calls fails. > > Additionally rename the 'probe_out' goto label's name to the more > descriptive 'disable_device'. > > Signed-off-by: Johannes Thumshirn > Fixes: e315cd28b9ef ("[SCSI] qla2xxx: Code changes for qla data structure refactoring") Hello Johannes, Please consider adding a Cc: stable tag to this patch. Since otherwise this patch looks fine to me: Reviewed-by: Bart Van Assche