It's unused now.  Also kill off the stupid = NULL initializations
in usb-storage that made this not compile the first time..