Skip to contentSkip to conversation

nfc: mrvl: spi: Unregister dev on allocation fail

PATCH New Greg Kroah-Hartman 1 participant 1 message Jul 7 NFC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfc: mrvl: spi: Unregister dev on allocation fail

From: Griffin Kroah-Hartman <[email protected]>

Call nfcmrvl_nci_unregister_dev() if nci_spi_allocate_spi() fails, unwrapping the previous call to nfcmrvl_nci_register_dev() during the nfcmrvl_spi_probe() function.

Assisted-by gkh-clanker-2000
Cc David Heidelberg <[email protected]>
---
 drivers/nfc/nfcmrvl/spi.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/nfc/nfcmrvl/spi.c +4 -0
index 9c8cde1250fb..dad07c8e13b8 100644
@@ -168,6 +168,10 @@ static int nfcmrvl_spi_probe(struct spi_device *spi)
 
 	drv_data->nci_spi = nci_spi_allocate_spi(drv_data->spi, 0, 10,
 						 drv_data->priv->ndev);
+	if (!drv_data->nci_spi) {
+		nfcmrvl_nci_unregister_dev(drv_data->priv);
+		return -ENOMEM;
+	}
 
 	/* Init completion for slave handshake */
 	init_completion(&drv_data->handshake_completion);
Signature · 1 line
2.55.0