[SCSI] More USB deadlock fixes