diff options
author | Ulrich Kunitz <kune@deine-taler.de> | 2007-02-18 15:28:23 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 11:00:54 -0400 |
commit | 35c3404efa7407811b706453f83d39b2539dcbd0 (patch) | |
tree | db3d0e9b9211fc1aa1694db024c0994b28e92ecb /drivers/net/wireless/zd1211rw/zd_chip.c | |
parent | 375dd24428cfe900f4ed95d301fe604f8e0d459b (diff) |
[PATCH] zd1211rw: changed GFP_NOFS to GFP_KERNEL
Michael Buesch commented that GFP_NOFS should not be used in a
network driver.
Signed-off-by: Ulrich Kunitz <kune@deine-taler.de>
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 87ee3ee020fe..680a1781a74c 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -114,7 +114,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr | |||
114 | /* Allocate a single memory block for values and addresses. */ | 114 | /* Allocate a single memory block for values and addresses. */ |
115 | count16 = 2*count; | 115 | count16 = 2*count; |
116 | a16 = (zd_addr_t *) kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)), | 116 | a16 = (zd_addr_t *) kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)), |
117 | GFP_NOFS); | 117 | GFP_KERNEL); |
118 | if (!a16) { | 118 | if (!a16) { |
119 | dev_dbg_f(zd_chip_dev(chip), | 119 | dev_dbg_f(zd_chip_dev(chip), |
120 | "error ENOMEM in allocation of a16\n"); | 120 | "error ENOMEM in allocation of a16\n"); |
@@ -163,7 +163,7 @@ int _zd_iowrite32v_locked(struct zd_chip *chip, const struct zd_ioreq32 *ioreqs, | |||
163 | 163 | ||
164 | /* Allocate a single memory block for values and addresses. */ | 164 | /* Allocate a single memory block for values and addresses. */ |
165 | count16 = 2*count; | 165 | count16 = 2*count; |
166 | ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_NOFS); | 166 | ioreqs16 = kmalloc(count16 * sizeof(struct zd_ioreq16), GFP_KERNEL); |
167 | if (!ioreqs16) { | 167 | if (!ioreqs16) { |
168 | r = -ENOMEM; | 168 | r = -ENOMEM; |
169 | dev_dbg_f(zd_chip_dev(chip), | 169 | dev_dbg_f(zd_chip_dev(chip), |