1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 1ef1bfe6a9d7..d43e3740e45d 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -541,8 +541,9 @@ static int p54_parse_rssical(struct ieee80211_hw *dev,
                 entries = (len - offset) /
                         sizeof(struct pda_rssi_cal_ext_entry);
 
-                if ((len - offset) % sizeof(struct pda_rssi_cal_ext_entry) ||
-                    entries <= 0) {
+                if (len < offset ||
+                    (len - offset) % sizeof(struct pda_rssi_cal_ext_entry) ||
+                    entries == 0) {
                         wiphy_err(dev->wiphy, "invalid rssi database.\n");
                         goto err_data;
                 }