diff --git a/net/nfc/digital_core.c b/net/nfc/digital_core.c
index 27769ac89d274928a5db673c54c060e23819395b..6e0b255aec6606ef9741b0ebddfe6f35be45ab2c 100644
--- a/net/nfc/digital_core.c
+++ b/net/nfc/digital_core.c
@@ -842,6 +842,14 @@ void nfc_digital_unregister_device(struct nfc_digital_dev *ddev)
 
 	list_for_each_entry_safe(cmd, n, &ddev->cmd_queue, queue) {
 		list_del(&cmd->queue);
+
+		/* Call the command callback if any and pass it a ENODEV error.
+		 * This gives a chance to the command issuer to free any
+		 * allocated buffer.
+		 */
+		if (cmd->cmd_cb)
+			cmd->cmd_cb(ddev, cmd->cb_context, ERR_PTR(-ENODEV));
+
 		kfree(cmd->mdaa_params);
 		kfree(cmd);
 	}