diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-03 21:46:00 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-11-03 21:46:00 -0400 |
commit | 6266f7df38e167a2386ee2747965c4816f32b449 (patch) | |
tree | ff3d243efd8c374d2c9686de4a104da71218a952 /drivers/scsi/mpi3mr/mpi3mr_os.c | |
parent | 5ae17501bc62a49b0b193dcce003f16375f16654 (diff) | |
parent | 09d9e4d041876684d33f21d02bcdaea6586734f1 (diff) |
Merge branch '5.15/scsi-fixes' into 5.16/scsi-queue
The partial UFS revert in 5.15 is needed for some additional fixes in
the 5.16 SCSI tree. Merge the fixes branch.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/mpi3mr/mpi3mr_os.c')
-rw-r--r-- | drivers/scsi/mpi3mr/mpi3mr_os.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/mpi3mr/mpi3mr_os.c b/drivers/scsi/mpi3mr/mpi3mr_os.c index 6373a877f439..fe10f257b5a4 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_os.c +++ b/drivers/scsi/mpi3mr/mpi3mr_os.c @@ -3736,7 +3736,7 @@ mpi3mr_probe(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_lun = -1; shost->unique_id = mrioc->id; - shost->max_channel = 1; + shost->max_channel = 0; shost->max_id = 0xFFFFFFFF; if (prot_mask >= 0) |