Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / drivers / net / phy / davicom.c

diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c
index e96a4af03d7dc5ae5fe53101bd9186b575abf3cd..0a6e4107ba5dfd0f005a2c2bc06bc5d9a1dc0a4a 100644 (file)
--- a/drivers/net/phy/davicom.c
+++ b/drivers/net/phy/davicom.c
@@ -1,24 +1,10 @@
 /*
  * Davicom PHY drivers
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
- *
  */
 #include <phy.h>
 
@@ -74,10 +60,13 @@ static int dm9161_parse_status(struct phy_device *phydev)
 
 static int dm9161_startup(struct phy_device *phydev)
 {
-       genphy_update_link(phydev);
-       dm9161_parse_status(phydev);
+       int ret;
 
-       return 0;
+       ret = genphy_update_link(phydev);
+       if (ret)
+               return ret;
+
+       return dm9161_parse_status(phydev);
 }
 
 static struct phy_driver DM9161_driver = {