From patchwork Thu Mar 1 15:27:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130281 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2952145edc; Thu, 1 Mar 2018 07:38:19 -0800 (PST) X-Google-Smtp-Source: AG47ELvtgtjujtS/dRu5sp4R12UA6GKBQJgT+uPpjqFljxP0ZzqbjwT7Oto9VwNr/c6tUYC7110N X-Received: by 10.98.20.22 with SMTP id 22mr2312875pfu.141.1519918699651; Thu, 01 Mar 2018 07:38:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918699; cv=none; d=google.com; s=arc-20160816; b=L5GOf/mG9pDOUKYSLHt9Zyrijg6o8RxbKuN8gB/leiQk3lclS3Hne51wwC3jwwvzli XUzpREkBZBSpViRgwW13pYsV76u0AvTA63xXVrLuwYQGpvIzV0F2lTNA2w4QEqGqW0D8 21n+zg/eQdIl/3Oj6jrGPcNVB5nhlHKjVTTrIIht13hx9/a9/iTHMrfXbcBbq5ekTiOQ fnBgIrxLc9IYsEKqBj/C7WZdtpqlmGt2oKFrNYtswKiphmTBvgav8GrfK9BLRctks3bx UeBS/YWekkGfzXbKHQrDaAh28qMvjYjT9oUXPRmxqRv78opSQJE7V0Ewcp0V6rItvhbN XvZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-id:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=zkMj3f4M9Pz/y4tBxQ5BKsO9cR0Aine7gocA2bum6X8=; b=ph+8P8ZuQVxMdF65+cQNT4YSAvgdUDuchxkuhwjssk8LKo714Wu7BM/fRjOm6b08dO QWThvQftgVrDa/DqRVIC1hTF+6RFpPsH9vQWCilCWXat+rVL3J25ouWA52KLtwuXgFW+ +d6w3d47BdwZ3i05xKx86K4nUpCZsqAg6D7ZEvQLXfjBW1LFMjZsXUIITec9xxX4SdiW VWtcliExGVJ48lD72Di81JAouvpfjG4zdIItAGTMvFDeuw5Am4qUoh3vyQeI21QAaKVm kAw0Bvk8XtOQWV3kbEap2Z97DAgZsEV6/9VIjuExeGBDLGPc1etqkgZyKyqNFOHkTAs2 lnIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=ORJFooCc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d24-v6si3165005plr.615.2018.03.01.07.38.19; Thu, 01 Mar 2018 07:38:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=ORJFooCc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031999AbeCAPiR (ORCPT + 10 others); Thu, 1 Mar 2018 10:38:17 -0500 Received: from mail-bn3nam01on0104.outbound.protection.outlook.com ([104.47.33.104]:2464 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032519AbeCAPhx (ORCPT ); Thu, 1 Mar 2018 10:37:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zkMj3f4M9Pz/y4tBxQ5BKsO9cR0Aine7gocA2bum6X8=; b=ORJFooCcXfjuuSSlCj3dWntuphN/s3BskkFgNxkv6W6ibsN3LTVgF/RmgYcC9lYrVxTnxMXWsqQe7zlAhw6pmgqTlcpc6zYNVp7ypny+9927zdjU72xZg+c0ufiLb03xqTVHm4KLiLnrK8e6ElzmgZ0SmwEfl8h1byW69k8xZPY= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:37:50 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:37:50 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , Brian Norris , Sasha Levin Subject: [added to the 4.1 stable tree] mtd: ichxrom: maybe-uninitialized with gcc-4.9 Thread-Topic: [added to the 4.1 stable tree] mtd: ichxrom: maybe-uninitialized with gcc-4.9 Thread-Index: AQHTsXHHMD/7SGdjwUar8mOkXn1qmw== Date: Thu, 1 Mar 2018 15:27:16 +0000 Message-ID: <20180301152116.1486-447-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0902; 7:reZBVEUlVjdgPzZT9H1TO49z3GP6m1RITD8JlVUe14kQ9I9EJgcaKhihfXdRve2/3naoirQTj7tDIhRVD+C1rVKZj12ktMjMwMkczFlcG58DDyi42hld8OD9j0Og18UC4cgTFmlvGhwfyrY95VZxNADDsRywH8ZhkxJj8g5lnidwrrgZ1zwB35NPPOnILaAc3j6auRiC7cbpZi6+eMX2sv+q7f6kxjCwsrujz6JgiCCNn8eTBfQ3IuK+xU9aJRFw x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: a4b2c1be-a3fa-456f-1d17-08d57f8a6455 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501229)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(366004)(376002)(39380400002)(39860400002)(346002)(199004)(189003)(6116002)(72206003)(1076002)(3846002)(25786009)(2900100001)(36756003)(14454004)(316002)(3660700001)(6666003)(54906003)(110136005)(2950100002)(305945005)(7736002)(99286004)(5250100002)(86612001)(10090500001)(107886003)(66066001)(106356001)(2501003)(6512007)(6486002)(97736004)(6436002)(22452003)(68736007)(81166006)(8676002)(81156014)(53936002)(186003)(26005)(105586002)(3280700002)(8936002)(76176011)(478600001)(4326008)(10290500003)(575784001)(86362001)(5660300001)(39060400002)(2906002)(6506007)(102836004)(59450400001)(6346003)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: uEF0r8Ri2VxzLWqWBPqk+CmmaDo/O0g9+pLhg+pLHhY0yCZQlYLjNKhP1SuVGgBvDq33OPk7Z4Pf02zFmkwRzBccpLPEXckkII2uheOG9T2ePss+GxZbYDOyVonrNAQqZxAZScRkKMlxpcgTAOnyDGXAJT79Ad6R6aYj6YPhJKU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <193B8431D0180B47B826C4C0AD6A3D8C@namprd21.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4b2c1be-a3fa-456f-1d17-08d57f8a6455 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:16.1612 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit e70dda0868fad0f74c46df21f7f45fec24f29879 ] pci_read_config_word() might fail and not initialize its output, as pointed out by older versions of gcc when using the -Wmaybe-unintialized flag: drivers/mtd/maps/ichxrom.c: In function ‘ichxrom_cleanup’: drivers/mtd/maps/ichxrom.c:63:2: error: ‘word’ is used uninitialized in this function [-Werror=uninitialized] This is apparently a correct warning, though it does not show up with newer compilers. Changing the code to not attempt to write back uninitialized data into PCI config space is a correct fix for the problem and avoids the warning. Signed-off-by: Arnd Bergmann Reviewed-by: Marek Vasut Signed-off-by: Brian Norris Signed-off-by: Sasha Levin --- drivers/mtd/maps/ichxrom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index c7478e18f485..2fb2d0ec3367 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c @@ -57,10 +57,12 @@ static void ichxrom_cleanup(struct ichxrom_window *window) { struct ichxrom_map_info *map, *scratch; u16 word; + int ret; /* Disable writes through the rom window */ - pci_read_config_word(window->pdev, BIOS_CNTL, &word); - pci_write_config_word(window->pdev, BIOS_CNTL, word & ~1); + ret = pci_read_config_word(window->pdev, BIOS_CNTL, &word); + if (!ret) + pci_write_config_word(window->pdev, BIOS_CNTL, word & ~1); pci_dev_put(window->pdev); /* Free all of the mtd devices */