Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45dd39b9 authored by Johan Hovold's avatar Johan Hovold Committed by Samuel Ortiz
Browse files

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: 3194c687 ("NFC: nfcmrvl: add firmware download support")
Cc: stable <stable@vger.kernel.org>     # 4.4
Cc: Vincent Cuissard <cuissard@marvell.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e5834ac2

drivers/nfc/nfcmrvl/main.c

+9 −7
Original line number Diff line number Diff line
@@ -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: