aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-07 21:10:48 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-25 21:23:48 -0700
commit0a9cb8d371991dceed054aec71541653e330180f (patch)
treee1bf7a89b4d0e4ab9bcd4d3d8a892157ebd8cd52 /drivers/net
parentcef72624c31364e7020450571393a4d5a0e44b34 (diff)
downloadkernel_samsung_smdk4412-0a9cb8d371991dceed054aec71541653e330180f.zip
kernel_samsung_smdk4412-0a9cb8d371991dceed054aec71541653e330180f.tar.gz
kernel_samsung_smdk4412-0a9cb8d371991dceed054aec71541653e330180f.tar.bz2
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-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 61e6d39..4099712 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -823,7 +823,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;