Commit a9e9b78d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ravb-fixes' 

Yoshihiro Shimoda says:

====================
net: ravb: Fix potential issues

Fix potentiall issues on the ravb driver.

Changes from v2:
https://lore.kernel.org/all/20230123131331.1425648-1-yoshihiro.shimoda.uh@renesas.com/
 - Add Reviewed-by in the patch [2/2].
 - Add a commit description in the patch [2/2].

Changes from v1:
https://lore.kernel.org/all/20230119043920.875280-1-yoshihiro.shimoda.uh@renesas.com/


 - Fix typo in the patch [1/2].
 - Add Reviewed-by in the patch [1/2].
 - Fix "Fixed" tag in the patch [2/2].
 - Fix a comment indentation of the code in the patch [2/2].
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f2b0b521 f3c07758

drivers/net/ethernet/renesas/ravb_main.c

+8 −2
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ static void ravb_error_interrupt(struct net_device *ndev) 
	ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS);

	if (eis & EIS_QFS) {

		ris2 = ravb_read(ndev, RIS2);

		ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED),

		ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED),

			   RIS2);



		/* Receive Descriptor Empty int */
@@ -2973,6 +2973,9 @@ static int __maybe_unused ravb_suspend(struct device *dev) 
	else

		ret = ravb_close(ndev);



	if (priv->info->ccc_gac)

		ravb_ptp_stop(ndev);



	return ret;

}
@@ -3011,6 +3014,9 @@ static int __maybe_unused ravb_resume(struct device *dev) 
	/* Restore descriptor base address table */

	ravb_write(ndev, priv->desc_bat_dma, DBAT);



	if (priv->info->ccc_gac)

		ravb_ptp_init(ndev, priv->pdev);



	if (netif_running(ndev)) {

		if (priv->wol_enabled) {

			ret = ravb_wol_restore(ndev);