I've made a similar patch to BSD-specific USB driver, please review it too.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401563