Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp479300ybl; Tue, 28 Jan 2020 06:36:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxcw7NSsLfhvXkpYDH+qpNys88op4yo8a6LHOVMEVTvHDEg7ZEFkJBKrrjBkyKMOKaq9SP5 X-Received: by 2002:aca:f305:: with SMTP id r5mr3089301oih.174.1580222163356; Tue, 28 Jan 2020 06:36:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580222163; cv=none; d=google.com; s=arc-20160816; b=BaksZIVj/zDl3doHeRHya1K77TVMzAV95HOWcuMwGoFKepZl3ryBmpjwon15avWCDD eP+XT9PbJxpXrQC6jhAH3vIknh5xMz7ANiqSmlOIz7wZ6aneHTfBKhwT9Oa8IPVq4gO5 JB5MaG2oe90oNPvONpDxGDsMNBmuvkZCA6GpaHEXwymLh5EdoTXhnBj5YHweHCOG2j24 +WcXUGjaBdjdcuKkWMzgCsd5HUW9/uWZ5CtMIchhF8BmCI9IRcIUeOmQZvshF38MTaea mYAzNbZhX12UnmeZBnln3/r09OLTx5UtsK7WHLC+4JkLl0jFVZ3CJLJXOQcwcMh0GkzB usZg== 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=5kDn9xXKK0TsZHBso+2vWKQvgffgknFMIevOwtIRf+g=; b=rI7+hXRXKc1/xZU7F9NvvC8RKmpyUHluqNioU3130HRugn63qqpt5ICjNGEovi1HQ/ tocgxyD58huLXJSgC2i/JcgnaDk4QXgU50KsF5PIjxxifTlk0Vbehm+bSglwDZmNIlWJ qDVPHS3da6HJC7xXn/5x+gr9WkBMFs3+WwcqcAmOO5LMjV7z2+7jINmQhE7vt87z8bU9 sNkv51e8+/HfNHTEvnnwMEjsZF+zpKbs0bzYW1b1mmoTUt+7P+01dD9+Y9MCzX5gnplo U2EF7SH+94yO7qSW3o59mPGGEYGOy6dhXVZpl7egj9i3NT2kIc580QmtpxxZBFb/4HMK ZchA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UEV1HTxj; 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 i20si8716839otk.270.2020.01.28.06.35.51; Tue, 28 Jan 2020 06:36:03 -0800 (PST) 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=UEV1HTxj; 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 S1731504AbgA1OYX (ORCPT + 99 others); Tue, 28 Jan 2020 09:24:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:50896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730619AbgA1OYP (ORCPT ); Tue, 28 Jan 2020 09:24:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 BA45821739; Tue, 28 Jan 2020 14:24:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580221455; bh=DmRJo0p4TExwlSUs+a2X+E6ya8Q/AADkX/YVkV2Pce4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UEV1HTxj2ODyQBj9ZF7wEoW1Q61x/5VmXGcc6xJApDsk1uDxKo0f/sxSnKAICCW84 J9RaysjcAVRVDI4vnngzfeM1cuOmchx69j2FR3mOdPSJ3eyi2QtV2q5jgIMuaEscgB pYMolc7VC/awg9JFgJ05RtC/Bq9TFMfBvywiKjVw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 194/271] bcma: fix incorrect update of BCMA_CORE_PCI_MDIO_DATA Date: Tue, 28 Jan 2020 15:05:43 +0100 Message-Id: <20200128135907.025416043@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135852.449088278@linuxfoundation.org> References: <20200128135852.449088278@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: Colin Ian King [ Upstream commit 420c20be08a4597404d272ae9793b642401146eb ] An earlier commit re-worked the setting of the bitmask and is now assigning v with some bit flags rather than bitwise or-ing them into v, consequently the earlier bit-settings of v are being lost. Fix this by replacing an assignment with the bitwise or instead. Addresses-Coverity: ("Unused value") Fixes: 2be25cac8402 ("bcma: add constants for PCI and use them") Signed-off-by: Colin Ian King Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin --- drivers/bcma/driver_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bcma/driver_pci.c b/drivers/bcma/driver_pci.c index f499a469e66d0..12b2cc9a3fbe8 100644 --- a/drivers/bcma/driver_pci.c +++ b/drivers/bcma/driver_pci.c @@ -78,7 +78,7 @@ static u16 bcma_pcie_mdio_read(struct bcma_drv_pci *pc, u16 device, u8 address) v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); } - v = BCMA_CORE_PCI_MDIODATA_START; + v |= BCMA_CORE_PCI_MDIODATA_START; v |= BCMA_CORE_PCI_MDIODATA_READ; v |= BCMA_CORE_PCI_MDIODATA_TA; @@ -121,7 +121,7 @@ static void bcma_pcie_mdio_write(struct bcma_drv_pci *pc, u16 device, v |= (address << BCMA_CORE_PCI_MDIODATA_REGADDR_SHF_OLD); } - v = BCMA_CORE_PCI_MDIODATA_START; + v |= BCMA_CORE_PCI_MDIODATA_START; v |= BCMA_CORE_PCI_MDIODATA_WRITE; v |= BCMA_CORE_PCI_MDIODATA_TA; v |= data; -- 2.20.1