Fix r29053 red and a leftover use of 'usb' variable as a bool rather than int in...