Skip to content

Commit

Permalink
net: phy: micrel: Fix warn: passing zero to PTR_ERR
Browse files Browse the repository at this point in the history
Handle the NULL pointer case

Fixes New smatch warnings:
drivers/net/phy/micrel.c:2613 lan8814_ptp_probe_once() warn: passing zero to 'PTR_ERR'

vim +/PTR_ERR +2613 drivers/net/phy/micrel.c
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Alexander Duyck <alexanderduyck@fb.com>
Signed-off-by: Divya Koppera <Divya.Koppera@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Divya Koppera authored and David S. Miller committed Jan 9, 2023
1 parent d50ede4 commit 3f88d7d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/phy/micrel.c
Original file line number Diff line number Diff line change
Expand Up @@ -3008,10 +3008,6 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev)
{
struct lan8814_shared_priv *shared = phydev->shared->priv;

if (!IS_ENABLED(CONFIG_PTP_1588_CLOCK) ||
!IS_ENABLED(CONFIG_NETWORK_PHY_TIMESTAMPING))
return 0;

/* Initialise shared lock for clock*/
mutex_init(&shared->shared_lock);

Expand All @@ -3031,12 +3027,16 @@ static int lan8814_ptp_probe_once(struct phy_device *phydev)

shared->ptp_clock = ptp_clock_register(&shared->ptp_clock_info,
&phydev->mdio.dev);
if (IS_ERR_OR_NULL(shared->ptp_clock)) {
if (IS_ERR(shared->ptp_clock)) {
phydev_err(phydev, "ptp_clock_register failed %lu\n",
PTR_ERR(shared->ptp_clock));
return -EINVAL;
}

/* Check if PHC support is missing at the configuration level */
if (!shared->ptp_clock)
return 0;

phydev_dbg(phydev, "successfully registered ptp clock\n");

shared->phydev = phydev;
Expand Down

0 comments on commit 3f88d7d

Please sign in to comment.