From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-bluetooth@vger.kernel.org
Cc: Amitkumar Karwar <akarwar@marvell.com>,
Marcel Holtmann <marcel@holtmann.org>,
Brian Norris <briannorris@chromium.org>,
Jeffy Chen <jeffy.chen@rock-chips.com>,
Johan Hedberg <johan.hedberg@gmail.com>,
Gustavo Padovan <gustavo@padovan.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/3] btmrvl: set irq_bt to -1 when failed to parse it
Date: Fri, 20 Jan 2017 19:14:19 +0800 [thread overview]
Message-ID: <1484910860-7690-2-git-send-email-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <1484910860-7690-1-git-send-email-jeffy.chen@rock-chips.com>
The irq_of_parse_and_map will return 0 as a invalid irq.
Set irq_bt to -1 in this case, so that the btmrvl resume/suspend code
would not get confused.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/bluetooth/btmrvl_sdio.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index c738bae..796f719 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -97,6 +97,7 @@ static int btmrvl_sdio_probe_of(struct device *dev,
cfg->irq_bt = irq_of_parse_and_map(card->plt_of_node, 0);
if (!cfg->irq_bt) {
dev_err(dev, "fail to parse irq_bt from device tree");
+ cfg->irq_bt = -1;
} else {
ret = devm_request_irq(dev, cfg->irq_bt,
btmrvl_wake_irq_bt,
--
2.1.4
next prev parent reply other threads:[~2017-01-20 11:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 11:14 [PATCH 1/3] btmrvl: avoid double-disable_irq() race Jeffy Chen
2017-01-20 11:14 ` Jeffy Chen [this message]
2017-01-20 19:27 ` [PATCH 2/3] btmrvl: set irq_bt to -1 when failed to parse it Brian Norris
2017-01-20 11:14 ` [PATCH 3/3] btmrvl: use dt's irqflags for wakeup pin Jeffy Chen
2017-01-20 19:19 ` Brian Norris
2017-01-20 19:29 ` [PATCH 1/3] btmrvl: avoid double-disable_irq() race Brian Norris
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=1484910860-7690-2-git-send-email-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=akarwar@marvell.com \
--cc=briannorris@chromium.org \
--cc=gustavo@padovan.org \
--cc=johan.hedberg@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
/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
all inboxes | Powered by JetHome®