ath6kl: Bringing in the upstream version

chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c

Index: chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
diff --git a/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 72525fa13478e02ef2a1ff79bc1cfd0f2aa4de8a..0e298dba9fc80cc3d54c304e8e77cd674a21dbf4 100644
--- a/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/chromeos/drivers/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2008 Atheros Communications Inc.
+ * Copyright (c) 2004-2010 Atheros Communications Inc.
  * All rights reserved.
  *
  * This file implements the Atheros PS and patch downloaded for HCI UART Transport driver.
@@ -287,7 +287,7 @@ int PSSendOps(void *arg)
                 }
 	
 #ifndef HCI_TRANSPORT_SDIO
-			if(bdaddr[0] !='\0') {
+			if(bdaddr && bdaddr[0] !='\0') {
 				write_bdaddr(hdev,bdaddr,BDADDR_TYPE_STRING);
 			}
 #endif 
@@ -361,9 +361,9 @@ int PSSendOps(void *arg)
         	goto complete;
     	}
         len = (firmware->size > MAX_BDADDR_FORMAT_LENGTH)? MAX_BDADDR_FORMAT_LENGTH: firmware->size;
-        memcpy(config_bdaddr, firmware->data,len);
-        config_bdaddr[len] = '\0';
-        write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);
+	memcpy(config_bdaddr, firmware->data,len);
+	config_bdaddr[len] = '\0';
+	write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);
        	A_RELEASE_FIRMWARE(firmware);
 	}
 complete: