summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/airo_cs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 11:25:16 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 11:25:16 -0700
commit62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch)
tree8f10dfd23c18600392965b69f94dd389e60827d5 /drivers/net/wireless/airo_cs.c
parent942b6f62164cf8822dd03b1569777f4663d1abd7 (diff)
parente71180f3689e00c5a1095925352a72dacdd62e34 (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/airo_cs.c')
-rw-r--r--drivers/net/wireless/airo_cs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index bf25584d68d3..784de9109113 100644
--- 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 */