From 82470f03529220b62d5c0d11ced830e73780e910 Mon Sep 17 00:00:00 2001 From: hq_guohongtao5_tmp Date: Thu, 8 Nov 2018 16:50:56 +0800 Subject: [PATCH] Revert "(CR):[factory]:[kane]:kernel: use trackid as adb device number" This reverts commit ced15c68af06c78d5615ea63439b2995c81540cf. --- drivers/usb/gadget/Kconfig | 6 ------ drivers/usb/gadget/configfs.c | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 6dcb53824a26..8ecde073082c 100755 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -515,12 +515,6 @@ config USB_CONFIGFS_F_MIDI connections can then be made on the gadget system, using ALSA's aconnect utility etc. -config TRACK_ID - bool "track id as serialno" - depends on USB_CONFIGFS - help - use track id as adb device number. - config USB_CONFIGFS_F_HID bool "HID function" depends on USB_CONFIGFS diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index a18a94d03fdc..068acc27ccbb 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -179,19 +179,18 @@ static int set_alt_serialnumber(struct gadget_strings *gs) char *str; int ret = -ENOMEM; -#ifdef CONFIG_TRACK_ID - return 0; -#endif str = kmalloc(CHIPID_SIZE + 1, GFP_KERNEL); if (!str) { pr_err("%s: failed to alloc for string\n", __func__); return ret; } + snprintf(str, CHIPID_SIZE + 1, "%016lx", (long)exynos_soc_info.unique_id); if (usb_string_copy(str, &gs->serialnumber)) pr_err("%s: failed to copy alternative string\n", __func__); else ret = 0; + kfree(str); return ret; } -- 2.20.1