summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-02-10 01:27:18 +0000
committerJohn W. Linville <linville@tuxdriver.com>2007-02-14 15:45:04 -0500
commit44956855ff9e21f58633a628b6b64e549a2fa0ed (patch)
tree636eac86a2084a7ebb798f7d1b6fc035727e8457
parentd9c7e0f20806795f7823e55ad3663c8828d51b5a (diff)
downloadop-kernel-dev-44956855ff9e21f58633a628b6b64e549a2fa0ed.zip
op-kernel-dev-44956855ff9e21f58633a628b6b64e549a2fa0ed.tar.gz
[PATCH] zd1211rw: Readd zd_addr_t cast
Robert P.J. Day's recent commit ("getting rid of all casts of k[cmz]alloc() calls") introduced a sparse warning for zd1211rw, related to our type-checking of addresses. zd_chip.c:116:15: warning: implicit cast to nocast type This patch readds the type cast, it is correct. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c2
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 78ea72f..953ac3a 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -101,7 +101,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),
OpenPOWER on IntegriCloud