Merge by Hand

[linux-2.6] / drivers / net / wireless / airo_cs.c

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index bf25584d68d3d7f9fd00dc5e64b58d77c72e10bb..784de9109113bac53a86d879bb28e245451bc755 100644 (file)
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -258,9 +258,7 @@ static void airo_detach(dev_link_t *link)
        
        /* Unlink device structure, free pieces */
        *linkp = link->next;
-       if (link->priv) {
-               kfree(link->priv);
-       }
+       kfree(link->priv);
        kfree(link);
        
 } /* airo_detach */