From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbbDGLnY (ORCPT ); Tue, 7 Apr 2015 07:43:24 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:35683 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbbDGLnU (ORCPT ); Tue, 7 Apr 2015 07:43:20 -0400 Message-ID: <1428406995.5137.1.camel@phoenix> Subject: [PATCH] phy: core: Fix error checking in (devm_)phy_optional_get From: Axel Lin To: Kishon Vijay Abraham I Cc: "linux-kernel@vger.kernel.org" Date: Tue, 07 Apr 2015 19:43:15 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Don't pass valid pointer to PTR_ERR, use PTR_ERR(phy) only when IS_ERR(phy) is true. Signed-off-by: Axel Lin --- drivers/phy/phy-core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index 3791838f..f112fff 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -530,8 +530,10 @@ struct phy *phy_optional_get(struct device *dev, const char *string) { struct phy *phy = phy_get(dev, string); - if (PTR_ERR(phy) == -ENODEV) - phy = NULL; + if (IS_ERR(phy)) { + if (PTR_ERR(phy) == -ENODEV) + phy = NULL; + } return phy; } @@ -584,8 +586,10 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string) { struct phy *phy = devm_phy_get(dev, string); - if (PTR_ERR(phy) == -ENODEV) - phy = NULL; + if (IS_ERR(phy)) { + if (PTR_ERR(phy) == -ENODEV) + phy = NULL; + } return phy; } -- 1.9.1