Fix cherry pick stuff
	modified:   drivers/usb/core/message.c