svn commit: r239704 - head/sys/dev/ath/ath_hal

[Adrian Chadd]

Author: adrian
Date: Sun Aug 26 04:26:49 2012
New Revision: 239704
URL: http://svn.freebsd.org/changeset/base/239704

Log:
  Move this magic check to only occur if no eeprom data is given.
  
  Tested on:
  
  	* AP99 (AR7241+AR9287)

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_9287.c

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_9287.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_9287.c	Sun Aug 26 04:26:25 2012	(r239703)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_9287.c	Sun Aug 26 04:26:49 2012	(r239704)
@@ -310,12 +310,12 @@ ath_hal_9287EepromAttach(struct ath_hal 
 			    "%s Error reading Eeprom MAGIC\n", __func__);
 			return HAL_EEREAD;
 		}
-	}
-	HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s Eeprom Magic = 0x%x\n",
-	    __func__, magic);
-	if (magic != AR5416_EEPROM_MAGIC) {
-		HALDEBUG(ah, HAL_DEBUG_ANY, "Bad magic number\n");
-		return HAL_EEMAGIC;
+		HALDEBUG(ah, HAL_DEBUG_ATTACH, "%s Eeprom Magic = 0x%x\n",
+		    __func__, magic);
+		if (magic != AR5416_EEPROM_MAGIC) {
+			HALDEBUG(ah, HAL_DEBUG_ANY, "Bad magic number\n");
+			return HAL_EEMAGIC;
+		}
 	}
 
 	ee = ath_hal_malloc(sizeof(HAL_EEPROM_9287));