m15 R5, lost keyboard function on reboot

My m15 R5 has lost keyboard function on reboot. There is a workaround to remove an offending USB Serial Bus controller that malfunctions. What a pain <Profanity deleted. DELL-Admin>, having to use the on screen keyboard to log in, delete the offending USB device, search for hardware changes and install new driver, close lid, then open - to usually get keyboard back. Dell, come on!