Merge "scsi: Remove compilation error introduced by a previous change"