commit 5a02f4f477ec3cc180bee0845e35f14a8253e143
author PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> Sun Feb 25 19:06:23 2024 -0800
committer SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> Sun Feb 25 19:06:24 2024 -0800
tree baa2e8b1739e06248c4f4485539b7c4ceb62375b
parent 9f506bb9c8f365708df29ffac4164c1b6e30f340
parent 1397c0fe67d2370417916ba76be82ea59b614f62

Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10

SBMerger: 605678113
Change-Id: I4ef8dae7e6ad597cfa52c9cf79ffb470656d3203
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

st21nfc.c

diff --git a/st21nfc.c b/st21nfc.c
index d656c17..6ed0912 100644
--- a/st21nfc.c
+++ b/st21nfc.c
@@ -914,6 +914,8 @@
 	if (st21nfc_dev == NULL)
 		return -ENOMEM;
 
+	dev->init_name = "i2c-st21nfc";
+
 	/* store for later use */
 	st21nfc_dev->client = client;
 	st21nfc_dev->r_state_current = ST21NFC_HEADER;