hid_warn(hdev, "bad device descriptor (%d)\n", ret);
        }
 
+       hdev->id = atomic_inc_return(&id);
+
        /* XXX hack, any other cleaner solution after the driver core
         * is converted to allow more than 20 bytes as the device name? */
        dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
-                    hdev->vendor, hdev->product, atomic_inc_return(&id));
+                    hdev->vendor, hdev->product, hdev->id);
 
        hid_debug_register(hdev, dev_name(&hdev->dev));
        ret = device_add(&hdev->dev);
 
        struct list_head debug_list;
        spinlock_t  debug_list_lock;
        wait_queue_head_t debug_wait;
+
+       unsigned int id;                                                /* system unique id */
 };
 
 #define to_hid_device(pdev) \