Merge branch 'linux-6.6-trunk/at91/net' into linux-6.6-mchp

cristibirsan · cristibirsan · commit eb79ffa0ca0b · 2024-05-14T17:03:15.000+03:00
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
@@ -4595,7 +4595,8 @@ static int lan8841_suspend(struct phy_device *phydev)
 	struct kszphy_priv *priv = phydev->priv;
 	struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;
 
-	ptp_cancel_worker_sync(ptp_priv->ptp_clock);
+	if (ptp_priv->ptp_clock)
+		ptp_cancel_worker_sync(ptp_priv->ptp_clock);
 
 	return genphy_suspend(phydev);
 }

Original file line number	Diff line number	Diff line change
`@@ -4595,7 +4595,8 @@ static int lan8841_suspend(struct phy_device *phydev)`
`4595`	`4595`	`struct kszphy_priv *priv = phydev->priv;`
`4596`	`4596`	`struct kszphy_ptp_priv *ptp_priv = &priv->ptp_priv;`
`4597`	`4597`
`4598`		`- ptp_cancel_worker_sync(ptp_priv->ptp_clock);`
	`4598`	`+ if (ptp_priv->ptp_clock)`
	`4599`	`+ ptp_cancel_worker_sync(ptp_priv->ptp_clock);`
`4599`	`4600`
`4600`	`4601`	`return genphy_suspend(phydev);`
`4601`	`4602`	`}`