Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/hif_usb.c

 /*
  * Copyright (c) 2010 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
@@ skipping 781 matching lines @@
                         kfree(buf);
                         return err;
                 }
 
                 len -= transfer;
                 data += transfer;
                 addr += transfer;
         }
         kfree(buf);
 
-        if (hif_dev->device_id == 0x7010)
+        switch (hif_dev->device_id) {
+        case 0x7010:
+        case 0x7015:
+        case 0x9018:
                 firm_offset = AR7010_FIRMWARE_TEXT;
-        else
+                break;
+        default:
                 firm_offset = AR9271_FIRMWARE_TEXT;
+                break;
+        }
 
         /*
          * Issue FW download complete command to firmware.
          */
         err = usb_control_msg(hif_dev->udev, usb_sndctrlpipe(hif_dev->udev, 0),
                               FIRMWARE_DOWNLOAD_COMP,
                               0x40 | USB_DIR_OUT,
                               firm_offset >> 8, 0, NULL, 0, HZ);
         if (err)
                 return -EIO;
@@ skipping 78 matching lines @@
                                                  &hif_dev->udev->dev);
         if (hif_dev->htc_handle == NULL) {
                 ret = -ENOMEM;
                 goto err_htc_hw_alloc;
         }
 
         /* Find out which firmware to load */
 
         switch(hif_dev->device_id) {
         case 0x7010:
+        case 0x7015:
         case 0x9018:
                 if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
                         hif_dev->fw_name = FIRMWARE_AR7010_1_1;
                 else
                         hif_dev->fw_name = FIRMWARE_AR7010;
                 break;
         default:
                 hif_dev->fw_name = FIRMWARE_AR9271;
                 break;
         }
 
-        if (!hif_dev->fw_name) {
-                dev_err(&udev->dev, "Can't determine firmware !\n");
-                goto err_htc_hw_alloc;
-        }
-
         ret = ath9k_hif_usb_dev_init(hif_dev);
         if (ret) {
                 ret = -EINVAL;
                 goto err_hif_init_usb;
         }
 
         ret = ath9k_htc_hw_init(hif_dev->htc_handle,
                                 &hif_dev->udev->dev, hif_dev->device_id);
         if (ret) {
                 ret = -EINVAL;
@@ skipping 120 matching lines @@
 
 int ath9k_hif_usb_init(void)
 {
         return usb_register(&ath9k_hif_usb_driver);
 }
 
 void ath9k_hif_usb_exit(void)
 {
         usb_deregister(&ath9k_hif_usb_driver);
 }