From: Luca Coelho <luca@coelho.fi>
To: linux-wireless@vger.kernel.org
Cc: "Jürg Billeter" <j@bitron.ch>, "Luca Coelho" <luciano.coelho@intel.com>
Subject: [PATCH 1/2] iwlwifi: fix double hyphen in MODULE_FIRMWARE for 8000
Date: Mon, 23 Jan 2017 13:56:21 +0200 [thread overview]
Message-ID: <20170123115622.23587-2-luca@coelho.fi> (raw)
In-Reply-To: <20170123115622.23587-1-luca@coelho.fi>
From: Jürg Billeter <j@bitron.ch>
Mistakenly, the driver is trying to load the 8000C firmware with an
incorrect name (i.e. with two hyphens where there should be only one)
and that fails. Fix that by removing the hyphen from the format
macro.
Fixes: e1ba684f762b ("iwlwifi: 8000: fix MODULE_FIRMWARE input")
Signed-off-by: Jürg Billeter <j@bitron.ch>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---
drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
index d02ca1491d16..8d3e53fac1da 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-8000.c
@@ -91,7 +91,7 @@
#define IWL8000_FW_PRE "iwlwifi-8000C-"
#define IWL8000_MODULE_FIRMWARE(api) \
- IWL8000_FW_PRE "-" __stringify(api) ".ucode"
+ IWL8000_FW_PRE __stringify(api) ".ucode"
#define IWL8265_FW_PRE "iwlwifi-8265-"
#define IWL8265_MODULE_FIRMWARE(api) \
--
2.11.0
next prev parent reply other threads:[~2017-01-23 11:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 11:56 [PATCH 0/2] iwlwifi: updates intended for v4.10 2017-01-23 Luca Coelho
2017-01-23 11:56 ` Luca Coelho [this message]
2017-01-23 11:56 ` [PATCH 2/2] iwlwifi: mvm: avoid crash on restart w/o reserved queues Luca Coelho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170123115622.23587-2-luca@coelho.fi \
--to=luca@coelho.fi \
--cc=j@bitron.ch \
--cc=linux-wireless@vger.kernel.org \
--cc=luciano.coelho@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox