Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[deliverable/linux.git] / drivers / net / wireless / ath / ath9k / ar9003_eeprom.c

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 25de6f9a9778a964828cd7ebcc6ae4ff970f75cf..ab2bfcb3bed2652981d64cbd32487bc08c6dd79d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3178,7 +3178,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                                mdata_size, length);
                        return -1;
                }
-               memcpy(mptr, (u8 *) (word + COMP_HDR_LEN), length);
+               memcpy(mptr, word + COMP_HDR_LEN, length);
                ath_dbg(common, EEPROM,
                        "restored eeprom %d: uncompressed, length %d\n",
                        it, length);
@@ -3199,7 +3199,7 @@ static int ar9300_compress_decision(struct ath_hw *ah,
                        "restore eeprom %d: block, reference %d, length %d\n",
                        it, reference, length);
                ar9300_uncompress_block(ah, mptr, mdata_size,
-                                       (u8 *) (word + COMP_HDR_LEN), length);
+                                       (word + COMP_HDR_LEN), length);
                break;
        default:
                ath_dbg(common, EEPROM, "unknown compression code %d\n", code);