diff options
| author | John W. Linville <linville@tuxdriver.com> | 2007-02-17 18:26:09 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-02-17 18:26:09 -0500 |
| commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
| tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /drivers/net/wireless/zd1211rw | |
| parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
| parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
| download | talos-obmc-linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.gz talos-obmc-linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.zip | |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
| -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 12dfc0b6efe6..9c64f894b71b 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), |
