| bgmac.c (c727c6f788e673add829e4b54e7894fb2907df1c) | bgmac.c (d6499f0b7c7ce3d69f658331e78e520c7ebcb238) |
|---|---|
| 1/* 2 * Driver for (BCM4706)? GBit MAC core on BCMA bus. 3 * 4 * Copyright (C) 2012 Rafał Miłecki <zajec5@gmail.com> 5 * 6 * Licensed under the GNU/GPL. See COPYING for details. 7 */ 8 --- 1434 unchanged lines hidden (view full) --- 1443 .link = 1, 1444 .speed = SPEED_1000, 1445 .duplex = DUPLEX_FULL, 1446 }; 1447 struct phy_device *phy_dev; 1448 int err; 1449 1450 phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL); | 1/* 2 * Driver for (BCM4706)? GBit MAC core on BCMA bus. 3 * 4 * Copyright (C) 2012 Rafał Miłecki <zajec5@gmail.com> 5 * 6 * Licensed under the GNU/GPL. See COPYING for details. 7 */ 8 --- 1434 unchanged lines hidden (view full) --- 1443 .link = 1, 1444 .speed = SPEED_1000, 1445 .duplex = DUPLEX_FULL, 1446 }; 1447 struct phy_device *phy_dev; 1448 int err; 1449 1450 phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL); |
| 1451 if (IS_ERR(phy_dev)) { | 1451 if (!phy_dev || IS_ERR(phy_dev)) { |
| 1452 dev_err(bgmac->dev, "Failed to register fixed PHY device\n"); | 1452 dev_err(bgmac->dev, "Failed to register fixed PHY device\n"); |
| 1453 return -ENODEV; | 1453 return PTR_ERR(phy_dev); |
| 1454 } 1455 1456 err = phy_connect_direct(bgmac->net_dev, phy_dev, bgmac_adjust_link, 1457 PHY_INTERFACE_MODE_MII); 1458 if (err) { 1459 dev_err(bgmac->dev, "Connecting PHY failed\n"); 1460 return err; 1461 } --- 168 unchanged lines hidden --- | 1454 } 1455 1456 err = phy_connect_direct(bgmac->net_dev, phy_dev, bgmac_adjust_link, 1457 PHY_INTERFACE_MODE_MII); 1458 if (err) { 1459 dev_err(bgmac->dev, "Connecting PHY failed\n"); 1460 return err; 1461 } --- 168 unchanged lines hidden --- |