summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-07 21:10:48 +0200
committerBen Hutchings <ben@decadent.org.uk>2013-04-25 20:25:40 +0100
commitadd02e682081ecdf0ee4eaf9d10dc6ef6235789d (patch)
tree5102d222d7c61c2ec5d50f70eb62798041863b11
parent5e034d8d1bf05aa6412b31aee72b0d55c1411308 (diff)
downloadlinux-stable-add02e682081ecdf0ee4eaf9d10dc6ef6235789d.tar.gz
linux-stable-add02e682081ecdf0ee4eaf9d10dc6ef6235789d.tar.bz2
linux-stable-add02e682081ecdf0ee4eaf9d10dc6ef6235789d.zip
ath9k_htc: accept 1.x firmware newer than 1.3
commit 319e7bd96aca64a478f3aad40711c928405b8b77 upstream. Since the firmware has been open sourced, the minor version has been bumped to 1.4 and the API/ABI will stay compatible across further 1.x releases. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 966661c9e586..84890d5c4814 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -801,7 +801,7 @@ static int ath9k_init_firmware_version(struct ath9k_htc_priv *priv)
* required version.
*/
if (priv->fw_version_major != MAJOR_VERSION_REQ ||
- priv->fw_version_minor != MINOR_VERSION_REQ) {
+ priv->fw_version_minor < MINOR_VERSION_REQ) {
dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version %d.%d\n",
MAJOR_VERSION_REQ, MINOR_VERSION_REQ);
return -EINVAL;