[PATCH 0/2][SRU][Xenial] Fix failed to load intel bluetooth firmware

[AceLan Kao]

BugLink: http://bugs.launchpad.net/bugs/1705633

[Impact]
After this linux-firmware bug[1] update the firmware files, it removes intel/ibt-11-16.{ddc,sfi} and add intel/ibt-12-16.{ddc,sfi}, but in btusb driver, it hardcoded the hw_variant as 11. So we got this kind of error after the linux-firmware package updated and lost the bt functions.

[ 5.516003] Bluetooth: hci0: Minimum firmware build 1 week 10 2014
[ 5.516181] bluetooth hci0: Direct firmware load for intel/ibt-11-16.sfi failed with error -2
[ 5.516183] Bluetooth: hci0: Failed to load Intel firmware file (-2)

[Fix]
This patch uses a hw_variant variable to replace the hardcoded 11.

[Test Case]
Verified on the machine has this issue, and confirm this patch works.

[Regression Potential]
The hw_variant variable has shown up since kernel 3.10 in this commit
   dffd30e Bluetooth: Add support for Intel Bluetooth device [8087:07dc]
So, we don't have to worry about old chips don't contains this info, since it exists
and be used for a very long time.

1. https://bugs.launchpad.net/ubuntu/+source/linux-firmware/+bug/1686815

Jürg Billeter (1):
  Bluetooth: btintel: Add MODULE_FIRMWARE entries for iBT 3.5
    controllers

Tedd Ho-Jeong An (1):
  Bluetooth: Replace constant hw_variant from Intel Bluetooth firmware
    filename

 drivers/bluetooth/btintel.c |  2 ++
 drivers/bluetooth/btusb.c   | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

-- 
2.7.4