[PATCH] eepro.c: module_param_array cleanup

[powerpc.git] / drivers / net / s2io.c

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 30fbaf0..5ea8977 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -705,8 +705,7 @@ static void free_shared_mem(struct s2io_nic *nic)
                        }
                        kfree(mac_control->rings[i].ba[j]);
                }
-               if (mac_control->rings[i].ba)
-                       kfree(mac_control->rings[i].ba);
+               kfree(mac_control->rings[i].ba);
        }
 #endif
 
@@ -2997,7 +2996,7 @@ int s2io_set_swapper(nic_t * sp)
                 SWAPPER_CTRL_RXF_W_FE |
                 SWAPPER_CTRL_XMSI_FE |
                 SWAPPER_CTRL_STATS_FE | SWAPPER_CTRL_STATS_SE);
-       if (nic->intr_type == INTA)
+       if (sp->intr_type == INTA)
                val64 |= SWAPPER_CTRL_XMSI_SE;
        writeq(val64, &bar0->swapper_ctrl);
 #else