Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / wireless / zd1211rw / zd_chip.c

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 87a95bcfee5735f593489cf52011068f4d92e0e1..6a9b66051cf7de38000dcc20f3a2d944cef4ceae 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -117,6 +117,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;
+       /* zd_addr_t is __nocast, so the kmalloc needs an explicit cast */
        a16 = (zd_addr_t *) kmalloc(count16 * (sizeof(zd_addr_t) + sizeof(u16)),
                                   GFP_KERNEL);
        if (!a16) {
@@ -1448,7 +1449,7 @@ int zd_rfwritev_locked(struct zd_chip *chip,
  */
 int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value)
 {
-       struct zd_ioreq16 ioreqs[] = {
+       const struct zd_ioreq16 ioreqs[] = {
                { CR244, (value >> 16) & 0xff },
                { CR243, (value >>  8) & 0xff },
                { CR242,  value        & 0xff },
@@ -1475,7 +1476,7 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip,
 int zd_chip_set_multicast_hash(struct zd_chip *chip,
                               struct zd_mc_hash *hash)
 {
-       struct zd_ioreq32 ioreqs[] = {
+       const struct zd_ioreq32 ioreqs[] = {
                { CR_GROUP_HASH_P1, hash->low },
                { CR_GROUP_HASH_P2, hash->high },
        };