The preceding patch to fix this was incomplete, since
it didn't work for the pure debug messages.  And that
was because the DEBUG-vs-CONFIG_USB_DEBUG stuff changed
somewhere.