Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8289825ybl; Thu, 16 Jan 2020 14:01:54 -0800 (PST) X-Google-Smtp-Source: APXvYqzZAu+NGdmmM8sCy2j2n23gkmWjVvjuo9icmeSgeF8zU5UMXu5NvPan0evfTwGB/40d55+B X-Received: by 2002:aca:ad11:: with SMTP id w17mr1035820oie.85.1579212114457; Thu, 16 Jan 2020 14:01:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579212114; cv=none; d=google.com; s=arc-20160816; b=TpI/6ry8MvOO8u/YbbKOkABkmnjNfhRvI5bk+/uHSjUDvWn/Dgi7KC0wcsmEixifAN ZPZwKw7ZOGTvo3FJySDDqRkzzxIjFjY3tq62OG1YEG4ps4Bm8sQHet/u0KN3s1i8yCjV vRa+NhOgHr2oTAfqHKKPUKnngNqhX8s9DdILJv43ta8hFl8rrPG8Ju2sgkyOVl2KjSRQ ussX/0P7+qQ3UXR0ogfffHXDWslnNX3Jj3IkrEmOLMxRUsPXs9nkBDtayilF+IYNXm0M Pb8ylUYYX0CTKhZoiMxdd3qv6o6f6J4oJetAxXfNetZqqoO+GqXVlDHVkIWlzav/6aAq Iygw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/5eX1tfeIcyWHg5IH6mtd4akj/5X1b/sl3Dbz2aihSQ=; b=AxOpGrC0+EzynW1Duw0nm5ppeYvvc0306k8XzcrzbSlYXGHR67NhIsdlC9Zl0JzcfN 6TZhsAB0+Uvhb2+9thL0QBTnkjNFP88EzsCYsPpnVYeYZN44PrMsBQiH5fGm61+MA3H0 F0UM1uSi2ljgsIcvPVsA20TsTZRQVP6huhA4S6uMuw1vXTsTS9H8Ttww3xFSGyE5ib1T Js54g3oxGllpx0pZid9adYdh/7w0CZ7dAKMlyHZlhYb/rgzvyazQ8mGp+WSyZzGdAxmL 7/BIk1CW0Yqr4x51kpkTtCJv1XFAfE/edIzZIDqqD7Mt6vTBe/XJyEFNN6x2hxs5p/OH 3IvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Ej+07r44; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q6si16318344otg.248.2020.01.16.14.01.38; Thu, 16 Jan 2020 14:01:54 -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=Ej+07r44; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393148AbgAPRhO (ORCPT + 99 others); Thu, 16 Jan 2020 12:37:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:52174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405292AbgAPRhH (ORCPT ); Thu, 16 Jan 2020 12:37:07 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 932072468C; Thu, 16 Jan 2020 17:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196226; bh=54xeeJt3oi2IZTScEVdGI/xjrie/0xH7YLIooRyhRns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ej+07r44qtZRxuQRX0uaM0lmUtfzEe4mhaf4DSi0HrZUkM0sF5UDaTtlsoJDoxXmH lcef4UXve2ACrleoUZ1Rgm5lvEI2tfVvywZd9acnM2k57d3XCp/eXKBnGNOfEi79yh xg4By5+meeiWcfsYXB0V4eLzQu7Bj/e5x4O/IHeg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Moritz Fischer , Andrew Lunn , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 059/251] net: phy: fixed_phy: Fix fixed_phy not checking GPIO Date: Thu, 16 Jan 2020 12:33:28 -0500 Message-Id: <20200116173641.22137-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Moritz Fischer [ Upstream commit 8f289805616e81f7c1690931aa8a586c76f4fa88 ] Fix fixed_phy not checking GPIO if no link_update callback is registered. In the original version all users registered a link_update callback so the issue was masked. Fixes: a5597008dbc2 ("phy: fixed_phy: Add gpio to determine link up/down.") Reviewed-by: Andrew Lunn Signed-off-by: Moritz Fischer Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/fixed_phy.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c index eb5167210681..3ab2eb677a59 100644 --- a/drivers/net/phy/fixed_phy.c +++ b/drivers/net/phy/fixed_phy.c @@ -67,11 +67,11 @@ static int fixed_mdio_read(struct mii_bus *bus, int phy_addr, int reg_num) do { s = read_seqcount_begin(&fp->seqcount); /* Issue callback if user registered it. */ - if (fp->link_update) { + if (fp->link_update) fp->link_update(fp->phydev->attached_dev, &fp->status); - fixed_phy_update(fp); - } + /* Check the GPIO for change in status */ + fixed_phy_update(fp); state = fp->status; } while (read_seqcount_retry(&fp->seqcount, s)); -- 2.20.1