From patchwork Mon Sep 26 19:11:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Albert ARIBAUD (3ADEV)" X-Patchwork-Id: 675307 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sjYVh6FVYz9sXR for ; Tue, 27 Sep 2016 05:11:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423313AbcIZTLv (ORCPT ); Mon, 26 Sep 2016 15:11:51 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:63466 "EHLO smtp2-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965069AbcIZTLu (ORCPT ); Mon, 26 Sep 2016 15:11:50 -0400 Received: from localhost.localdomain (unknown [IPv6:2001:470:1f13:25f:f3b5:892f:a6ed:3026]) (Authenticated sender: aribaud.smtp) by smtp2-g21.free.fr (Postfix) with ESMTPSA id 36F34200368; Mon, 26 Sep 2016 21:11:42 +0200 (CEST) From: "Albert ARIBAUD (3ADEV)" To: netdev@vger.kernel.org Cc: Jiri Kosina , Fugang Duan Subject: [PATCH] net: trivial: fix fsl fec_main mdio write return value Date: Mon, 26 Sep 2016 21:11:40 +0200 Message-Id: <20160926191140.12107-1-albert.aribaud@3adev.fr> X-Mailer: git-send-email 2.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If the MDIO enf-of-transfer wait loop does not time out, 0 should be returned to the caller through ret, but ret was not reset to 0 after receiving the return value of pm_runtime_get_sync(). Reset ret when no time out occurred. Signed-off-by: Albert ARIBAUD (3ADEV) --- drivers/net/ethernet/freescale/fec_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 01f7e81..0413c05 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1818,6 +1818,8 @@ static int fec_enet_mdio_write(struct mii_bus *bus, int mii_id, int regnum, netdev_err(fep->netdev, "MDIO write timeout\n"); ret = -ETIMEDOUT; } + else + ret = 0; pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev);