NFC: nfcmrvl: fix firmware-management initialisation
authorJohan Hovold <johan@kernel.org>
Thu, 30 Mar 2017 10:15:39 +0000 (12:15 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 18 Jun 2017 21:57:59 +0000 (23:57 +0200)
commit45dd39b974f6632222dd5cdcbea7358a077ab0b0
treef8929770d779896779a21fc96831a475959a51ad
parente5834ac22948169bbd7c45996d8d4905edd20f5e
NFC: nfcmrvl: fix firmware-management initialisation

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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/nfc/nfcmrvl/main.c