diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-20 11:28:42 -0500 |
| commit | 6606e17a7f1c3bc1b1e83d0c517f11d094e55bf1 (patch) | |
| tree | 83f20d0d3c12d9db75fdfc74454d781d2e4ea590 /drivers/net/wireless/zd1211rw/zd_chip.c | |
| parent | 6aab44475a1355365f0a24abe6f8eb32185a701e (diff) | |
| parent | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (diff) | |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 12dfc0b6efe..9c64f894b71 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c @@ -113,7 +113,7 @@ int zd_ioread32v_locked(struct zd_chip *chip, u32 *values, const zd_addr_t *addr /* Allocate a single memory block for values and addresses. */ count16 = 2*count; - a16 = kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)), + a16 = (zd_addr_t *) kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)), GFP_NOFS); if (!a16) { dev_dbg_f(zd_chip_dev(chip), |