ath6kl: Bringing in the upstream version

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

 /*
- * 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.
  * This file can be used for HCI SDIO transport implementation for AR6002 with HCI_TRANSPORT_SDIO
  * defined.
  *
  *
  * ar3kcpsconfig.c
  *
  *
@@ skipping 267 matching lines @@
     HciCmdList[0].Hcipacket,
     HciCmdList[0].packetLen,
     &event,
     &bufferToFree) == A_OK) {
         if(ReadPSEvent(event) == A_OK) { /* Exit if the status is success */
             if(bufferToFree != NULL) {
                 A_FREE(bufferToFree);
                 }
         
 #ifndef HCI_TRANSPORT_SDIO
-                        if(bdaddr[0] !='\0') {
+                        if(bdaddr && bdaddr[0] !='\0') {
                                 write_bdaddr(hdev,bdaddr,BDADDR_TYPE_STRING);
                         }
 #endif 
                status = 1;
                goto complete;
         }
         if(bufferToFree != NULL) {
                A_FREE(bufferToFree);
         }
     } else {
@@ skipping 53 matching lines @@
         if(A_REQUEST_FIRMWARE(&firmware,config_path,firmwareDev) < 0) {
                 AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("%s: firmware file open error\n", __FUNCTION__ ));
                 status = 1;
                 goto complete;
         }
         if(NULL == firmware || firmware->size == 0) {
                 status = 1;
                 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:
 #ifndef HCI_TRANSPORT_SDIO
     AthEnableSyncCommandOp(FALSE);    
     PSTagMode = FALSE;
     wake_up_interruptible(&PsCompleteEvent);
 #endif /* HCI_TRANSPORT_SDIO */
     if(NULL != HciCmdList) {
         AthFreeCommandList(&HciCmdList,numCmds);
@@ skipping 186 matching lines @@
         }
 
     }
     if(bufferToFree != NULL) {
         A_FREE(bufferToFree);
    }
     return result;
 }