From: Paolo Abeni <pabeni@redhat.com>
Date: Fri, 22 Apr 2022 07:56:00 +0000 (+0200)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f70925bf99406150d8133e775e49c9c459f78733;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

drivers/net/ethernet/microchip/lan966x/lan966x_main.c
  d08ed852560e ("net: lan966x: Make sure to release ptp interrupt")
  c8349639324a ("net: lan966x: Add FDMA functionality")

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

f70925bf99406150d8133e775e49c9c459f78733
diff --cc drivers/net/ethernet/microchip/lan966x/lan966x_main.c
index 106d8c83544d0,95830e3e2b1fb..afec115e46eb6
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@@ -687,8 -672,8 +687,11 @@@ static void lan966x_cleanup_ports(struc
  		lan966x->ana_irq = -ENXIO;
  	}
  
 +	if (lan966x->fdma)
 +		devm_free_irq(lan966x->dev, lan966x->fdma_irq, lan966x);
++
+ 	if (lan966x->ptp_irq)
+ 		devm_free_irq(lan966x->dev, lan966x->ptp_irq, lan966x);
  }
  
  static int lan966x_probe_port(struct lan966x *lan966x, u32 p,