RE: [PATCH net v3 2/2] net: fec: free the PPS interrupt before tearing down the PHC and netdev

index 7176803146f3..960b9f01c531 100644

--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h

@@ -670,6 +670,7 @@ struct fec_enet_private {

 	/* pps  */
 	int pps_channel;
+	int pps_irq;
 	unsigned int reload_period;
 	int pps_enable;
 	unsigned int next_counter;

diff --git a/drivers/net/ethernet/freescale/fec_ptp.c

b/drivers/net/ethernet/freescale/fec_ptp.c
index 56801c2009d5..598cd8024123 100644

--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c

@@ -778,6 +778,7 @@ void fec_ptp_init(struct platform_device *pdev, int

irq_idx)
 	hrtimer_setup(&fep->perout_timer, fec_ptp_pps_perout_handler,
CLOCK_REALTIME,
 		      HRTIMER_MODE_REL);

+	fep->pps_irq = -1;
 	irq = platform_get_irq_byname_optional(pdev, "pps");
 	if (irq < 0)
 		irq = platform_get_irq_optional(pdev, irq_idx);

@@ -785,11 +786,12 @@ void fec_ptp_init(struct platform_device *pdev, int

irq_idx)
 	 * only the PTP_CLOCK_PPS clock events should stop
 	 */
 	if (irq >= 0) {
-		ret = devm_request_irq(&pdev->dev, irq, fec_pps_interrupt,
-				       0, pdev->name, ndev);
+		ret = request_irq(irq, fec_pps_interrupt, 0, pdev->name, ndev);
 		if (ret < 0)
 			dev_warn(&pdev->dev, "request for pps irq failed(%d)\n",
 				 ret);
+		else
+			fep->pps_irq = irq;
 	}

 	fep->ptp_clock = ptp_clock_register(&fep->ptp_caps, &pdev->dev);

@@ -861,6 +863,12 @@ void fec_ptp_stop(struct platform_device *pdev)

 	cancel_delayed_work_sync(&fep->time_keep);
 	hrtimer_cancel(&fep->perout_timer);
+
+	if (fep->pps_irq >= 0) {
+		free_irq(fep->pps_irq, ndev);
+		fep->pps_irq = -1;
+	}
+
 	if (fep->ptp_clock)
 		ptp_clock_unregister(fep->ptp_clock);
 }

--

2.47.3