diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-19 23:04:50 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-19 23:04:50 -0400 |
| commit | fe2520094d88018423dfc42b3cd0015f74e8adea (patch) | |
| tree | 859b78d64961ad92873e835ad1520caeb34b292f /drivers/net/wireless/p54common.c | |
| parent | c9b2ca735a7685fa8aafd17b3cf3f9f20449d10b (diff) | |
| parent | 1f06862e11f23ebc99438c592be9c92560d78548 (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/p54common.c')
| -rw-r--r-- | drivers/net/wireless/p54common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c index 2c63cf0ad2cd..1437db0cf4b2 100644 --- a/drivers/net/wireless/p54common.c +++ b/drivers/net/wireless/p54common.c | |||
| @@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type, | |||
| 577 | struct p54_tx_control_filter *filter; | 577 | struct p54_tx_control_filter *filter; |
| 578 | 578 | ||
| 579 | hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) + | 579 | hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) + |
| 580 | priv->tx_hdr_len, GFP_KERNEL); | 580 | priv->tx_hdr_len, GFP_ATOMIC); |
| 581 | if (!hdr) | 581 | if (!hdr) |
| 582 | return -ENOMEM; | 582 | return -ENOMEM; |
| 583 | 583 | ||