Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2894842pxb; Tue, 24 Aug 2021 10:03:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYY8JOSl+mppkFcfLMluhiU3vqd9kPKGpetT09/ot6UZ6R+AVxBaNg7QEE2/k7O4Lntqh2 X-Received: by 2002:a6b:905:: with SMTP id t5mr31675357ioi.209.1629824621627; Tue, 24 Aug 2021 10:03:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629824621; cv=none; d=google.com; s=arc-20160816; b=CiH5xyxemU8XfuTZfJ9qBretEahtL8QZk+sXOXah2ICbwVzpLCbTvE2jJUImlHwF9n De/GX7q3W7nr44O0oKjEZN4ACbhxbsB5IGk6RMcrbuU3OaMoBl0sHYK8+B2VMTobZ1Vv ajVG2iK6DmRwwi4csqG0q1/EtZCsBvs+bjW61Z7M1AnLTCy7kNS7SQcYgnzOr8x1kNX4 zdOO/YE7smG5yJelokXgSYcenKIHjqhRoFrOPXnT++DJ58Ql1znWv2Vvt8iORMOraK+s rax2UVuWg7Q9cAydHG6XrxYGPSxkWb/uZmCTT3gdIQx+30Eu65W3sq1OyZqkSIE6lhsm BkUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vQfqwblREXmjALFn55pg+15ow04YGuEHeVcGuYf7ILo=; b=Zwq4jVkqi7hxNa9jZPB84ZK6SA2cifcH+gglF3S2FD1ZWCtCKfGVvENMkJ5LvYES+p owVacHtW38O85JxUYiCCBnceEkm70ZM1hrZu9Jcw0XoCjiL+lPZi9BtRWxWuJjzPP44O fDrUtBOu7yVwbbz7FIWZ2LWreNDWbrupsuId/9BXeXufg5so+NLorEDDZmNCRBJPNjLp cJ8u9hWSNDhjhWBGMB2IRO22lZgthgNbgWhUBFm1Huaonz7s9wOPukf/X38YxwSASHjt 7rIplQ/pvGnm0qk8wRZ32UlCpGyqwybh8pfhKdHDSoylQX8MsIIuQdClMpF6gdNkiovE IGgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iYpxprpG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u6si19670575jao.99.2021.08.24.10.03.19; Tue, 24 Aug 2021 10:03:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@kernel.org header.s=k20201202 header.b=iYpxprpG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239163AbhHXRB5 (ORCPT + 99 others); Tue, 24 Aug 2021 13:01:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:39664 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238842AbhHXQ7G (ORCPT ); Tue, 24 Aug 2021 12:59:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 09DBF6138B; Tue, 24 Aug 2021 16:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824245; bh=bOMIH33L41Oipiku4tIzUnvyTa03l4R0s1KVXBSBRJ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iYpxprpG4YxUUof4iDAcdzCFLWKZWf0cLgPZDAGFILppUf5E77IGP+2FsFu0Mtqed YpA57bTmkZp8qp029Ev6bCi3gw/U64XDLoVMHTfw2E4RvqcubRVoJwBBQhRwYUxUC2 QsJ5+zrKuonnCWsUl+X5GgDRfB4Se8bA9R47tkc64AEte7NpCPuWxt1iSnpnQKZ6/u GvywDzp/XCsWAqwhSss28oocJPtbXRZL9AtZhtQVHE4NoysNkXvJ2qc5L9ASkHf/FS hUnCv/6ktMSgrs+NPnP8Cv8moUDi/gbDxgDmhjQ/VMEctiiBxKurkdDyT+2W/TTEMj rTlo+9cb3iD+g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hayes Wang , "David S . Miller" , Sasha Levin Subject: [PATCH 5.13 078/127] r8152: fix writing USB_BP2_EN Date: Tue, 24 Aug 2021 12:55:18 -0400 Message-Id: <20210824165607.709387-79-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824165607.709387-1-sashal@kernel.org> References: <20210824165607.709387-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.13.13-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.13.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.13.13-rc1 X-KernelTest-Deadline: 2021-08-26T16:55+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hayes Wang [ Upstream commit a876a33d2a1102f99fc782fefb784f4dd4841d8c ] The register of USB_BP2_EN is 16 bits, so we should use ocp_write_word(), not ocp_write_byte(). Fixes: 9370f2d05a2a ("support request_firmware for RTL8153") Signed-off-by: Hayes Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/r8152.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 2cf763b4ea84..b2b77edf72b8 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -3963,7 +3963,7 @@ static void rtl_clear_bp(struct r8152 *tp, u16 type) case RTL_VER_15: default: if (type == MCU_TYPE_USB) { - ocp_write_byte(tp, MCU_TYPE_USB, USB_BP2_EN, 0); + ocp_write_word(tp, MCU_TYPE_USB, USB_BP2_EN, 0); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_8, 0); ocp_write_word(tp, MCU_TYPE_USB, USB_BP_9, 0); -- 2.30.2