git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux
[safe/jmp/linux-2.6]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-hcmd.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-hcmd.c
b/drivers/net/wireless/iwlwifi/iwl-hcmd.c
index
a231659
..
30e9ea6
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-hcmd.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-hcmd.c
@@
-234,7
+234,7
@@
cancel:
}
fail:
if (cmd->reply_page) {
-
free_pages(cmd->reply_page, priv->hw_params.rx_page_order
);
+
iwl_free_pages(priv, cmd->reply_page
);
cmd->reply_page = 0;
}
out: