From: Johan Hovold <johan@kernel.org>
To: Lauro Ramos Venancio <lauro.venancio@openbossa.org>,
Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
Samuel Ortiz <sameo@linux.intel.com>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>,
stable <stable@vger.kernel.org>,
Vincent Cuissard <cuissard@marvell.com>
Subject: [PATCH v2 5/8] NFC: nfcmrvl: fix firmware-management initialisation
Date: Thu, 30 Mar 2017 12:15:39 +0200 [thread overview]
Message-ID: <20170330101542.15384-6-johan@kernel.org> (raw)
In-Reply-To: <20170330101542.15384-1-johan@kernel.org>
The nci-device was never deregistered in the event that
fw-initialisation failed.
Fix this by moving the firmware initialisation before device
registration since the firmware work queue should be available before
registering.
Note that this depends on a recent fix that moved device-name
initialisation back to to nci_allocate_device() as the
firmware-workqueue name is now derived from the nfc-device name.
Fixes: 3194c6870158 ("NFC: nfcmrvl: add firmware download support")
Cc: stable <stable@vger.kernel.org> # 4.4
Cc: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/nfc/nfcmrvl/main.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 3e3fc9588f10..a446590a71ca 100644
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -158,26 +158,28 @@ struct nfcmrvl_private *nfcmrvl_nci_register_dev(enum nfcmrvl_phy phy,
goto error_free_gpio;
}
+ rc = nfcmrvl_fw_dnld_init(priv);
+ if (rc) {
+ nfc_err(dev, "failed to initialize FW download %d\n", rc);
+ goto error_free_dev;
+ }
+
nci_set_drvdata(priv->ndev, priv);
rc = nci_register_device(priv->ndev);
if (rc) {
nfc_err(dev, "nci_register_device failed %d\n", rc);
- goto error_free_dev;
+ goto error_fw_dnld_deinit;
}
/* Ensure that controller is powered off */
nfcmrvl_chip_halt(priv);
- rc = nfcmrvl_fw_dnld_init(priv);
- if (rc) {
- nfc_err(dev, "failed to initialize FW download %d\n", rc);
- goto error_free_dev;
- }
-
nfc_info(dev, "registered with nci successfully\n");
return priv;
+error_fw_dnld_deinit:
+ nfcmrvl_fw_dnld_deinit(priv);
error_free_dev:
nci_free_device(priv->ndev);
error_free_gpio:
--
2.12.2
next prev parent reply other threads:[~2017-03-30 10:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-30 10:15 [PATCH v2 0/8] NFC: fix device allocation and nfcmrvl crashes Johan Hovold
2017-03-30 10:15 ` [PATCH v2 1/8] NFC: fix broken device allocation Johan Hovold
2017-03-30 10:15 ` [PATCH v2 2/8] NFC: nfcmrvl_uart: add missing tty-device sanity check Johan Hovold
2017-03-30 10:15 ` [PATCH v2 3/8] NFC: nfcmrvl: do not use device-managed resources Johan Hovold
2017-03-30 10:15 ` [PATCH v2 4/8] NFC: nfcmrvl: use nfc-device for firmware download Johan Hovold
2017-03-30 10:15 ` Johan Hovold [this message]
2017-03-30 10:15 ` [PATCH v2 6/8] NFC: nfcmrvl_uart: fix device-node leak during probe Johan Hovold
2017-03-30 10:15 ` [PATCH v2 7/8] NFC: nfcmrvl_usb: use interface as phy device Johan Hovold
2017-03-30 10:15 ` [PATCH v2 8/8] NFC: nfcmrvl: allow gpio 0 for reset signalling Johan Hovold
2017-04-18 10:09 ` [PATCH v2 0/8] NFC: fix device allocation and nfcmrvl crashes Johan Hovold
2017-04-18 23:24 ` Samuel Ortiz
2017-04-26 10:36 ` Johan Hovold
2017-04-26 22:42 ` Samuel Ortiz
2017-05-16 9:42 ` Johan Hovold
2017-06-01 7:55 ` Johan Hovold
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=20170330101542.15384-6-johan@kernel.org \
--to=johan@kernel.org \
--cc=aloisio.almeida@openbossa.org \
--cc=cuissard@marvell.com \
--cc=lauro.venancio@openbossa.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=stable@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).