This reverts commit eea5a87d.

Conflicts:
	drivers/usb/core/quirks.c
	include/linux/usb/quirks.h
Signed-off-by: Zefan Li <lizefan@huawei.com>