Revert "(CR):[factory]:[kane]:kernel: use trackid as adb device number"

This reverts commit ced15c68af06c78d5615ea63439b2995c81540cf.

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 6dcb53824a262fdf6d93d2e3904f1c1bb48ef684..8ecde073082cc2edcae10515faf57fe1ca5582ea 100755 (executable)
--- 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 a18a94d03fdc8953dc4dfb3c76dd2a63210cbcf3..068acc27ccbb9d7760cac1db840de3b53e3423ee 100644 (file)
--- 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;
 }