Subject: [PATCH][ATM] iphase: doesn't call phy->start due to a bogus #ifndef

From: "Jorge Boncompte [DTI2]" <[email-masked]>
Date: Thu, 05 Jun 2008 18:17:00 +0200

This causes the suni driver to oops if you try to use sonetdiag to
get the statistics. Also add the corresponding phy->stop call to fix another
oops if you try to remove the module.

Signed-off-by: Jorge Boncompte [DTI2] <[email-masked]>
---
  drivers/atm/iphase.c |   25 +++++++++++++------------
  1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 1b7090a..521d8af 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2556,17 +2556,13 @@ static int __devinit ia_start(struct atm_dev *dev)
  		error = suni_init(dev);
  		if (error)
  			goto err_free_rx;
-		/*
-		 * Enable interrupt on loss of signal
-		 * SUNI_RSOP_CIE - 0x10
-		 * SUNI_RSOP_CIE_LOSE - 0x04
-		 */
-		ia_phy_put(dev, ia_phy_get(dev, 0x10) | 0x04, 0x10);
-#ifndef MODULE
-		error = dev->phy->start(dev);
-		if (error)
-			goto err_free_rx;
-#endif
+
+		if (dev->phy->start) {
+			error = dev->phy->start(dev);
+			if (error)
+				goto err_free_rx;
+		}
+
  		/* Get iadev->carrier_detect status */
  		IaFrontEndIntr(iadev);
  	}
@@ -3226,9 +3222,14 @@ static void __devexit ia_remove_one(struct pci_dev *pdev)
  	struct atm_dev *dev = pci_get_drvdata(pdev);
  	IADEV *iadev = INPH_IA_DEV(dev);

-	ia_phy_put(dev, ia_phy_get(dev,0x10) & ~(0x4), 0x10);
+	/* Disable phy interrupts */
+	ia_phy_put(dev, ia_phy_get(dev,
+			SUNI_RSOP_CIE) & ~(SUNI_RSOP_CIE_LOSE), SUNI_RSOP_CIE);
  	udelay(1);

+	if (dev->phy && dev->phy->stop)
+		dev->phy->stop(dev);
+
  	/* De-register device */
        	free_irq(iadev->irq, dev);
  	iadev_count--;
--