Revert revert of "[SCSI] fix usb storage oops"