Merge tag 'powerpc-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / drivers / atm / iphase.c

diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 3241486..9bba8f2 100644 (file)
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -2291,19 +2291,21 @@ static int get_esi(struct atm_dev *dev)
 static int reset_sar(struct atm_dev *dev)  
 {  
        IADEV *iadev;  
-       int i, error = 1;  
+       int i, error;
        unsigned int pci[64];  
          
        iadev = INPH_IA_DEV(dev);  
-       for(i=0; i<64; i++)  
-         if ((error = pci_read_config_dword(iadev->pci,  
-                               i*4, &pci[i])) != PCIBIOS_SUCCESSFUL)  
-             return error;  
+       for (i = 0; i < 64; i++) {
+               error = pci_read_config_dword(iadev->pci, i * 4, &pci[i]);
+               if (error != PCIBIOS_SUCCESSFUL)
+                       return error;
+       }
        writel(0, iadev->reg+IPHASE5575_EXT_RESET);  
-       for(i=0; i<64; i++)  
-         if ((error = pci_write_config_dword(iadev->pci,  
-                                       i*4, pci[i])) != PCIBIOS_SUCCESSFUL)  
-           return error;  
+       for (i = 0; i < 64; i++) {
+               error = pci_write_config_dword(iadev->pci, i * 4, pci[i]);
+               if (error != PCIBIOS_SUCCESSFUL)
+                       return error;
+       }
        udelay(5);  
        return 0;  
 }