From 62391b1790941deb749ef831279b8e1c6af31987 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Mon, 21 Jul 2008 06:19:35 -0700 Subject: [PATCH] Avoid comparison of incompatible types. Signed-off-by: Pavel Roskin Signed-off-by: Luis R. Rodriguez --- drivers/net/wireless/ath9k/hw.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c index 6063ecf..5ebf35e 100644 --- a/drivers/net/wireless/ath9k/hw.c +++ b/drivers/net/wireless/ath9k/hw.c @@ -852,9 +852,12 @@ static inline enum hal_status ath9k_hw_check_eeprom(struct ath_hal *ah) else el = ahp->ah_eeprom.baseEepHeader.length; + if (el < sizeof(struct ar5416_eeprom) / sizeof(u_int16_t)) + el = sizeof(struct ar5416_eeprom) / sizeof(u_int16_t); + eepdata = (u_int16_t *) (&ahp->ah_eeprom); - for (i = 0; i < - min(el, sizeof(struct ar5416_eeprom)) / sizeof(u_int16_t); i++) + + for (i = 0; i < el; i++) sum ^= *eepdata++; if (need_swap) { -- 1.5.4.3