diff options
author | Dave Airlie <airlied@redhat.com> | 2021-10-28 07:59:38 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-10-28 07:59:38 +0300 |
commit | 970eae15600a883e4ad27dd0757b18871cc983ab (patch) | |
tree | 7aeb639a35ca2ab8b54a5987837f8ac5f96ee5f4 /drivers/scsi/mpi3mr/mpi3mr_os.c | |
parent | 27f4432577e4f78bbdf15c104748cc738db8eead (diff) | |
parent | 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (diff) | |
download | linux-970eae15600a883e4ad27dd0757b18871cc983ab.tar.xz |
BackMerge tag 'v5.15-rc7' into drm-next
The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.
Signed-off-by: Dave Airlie <airlied@redhat.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 2197988333fe..3cae8803383b 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) |