diff options
| author |   Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-08-11 22:37:22 -0400 |
| commit | 315480209b8e1032e63c70dafc8f4133b3c9a333 (patch) | |
| tree | a99d5b3c2c1afb3d2ab47f77ecf4e933cd00715d /drivers/scsi/scsi_scan.c | |
| parent | scsi: isci: Use the proper SCSI midlayer interfaces for PI (diff) | |
| parent | scsi: core: Fix capacity set to zero after offlinining device (diff) | |
| download | linux-dev-315480209b8e1032e63c70dafc8f4133b3c9a333.tar.xz linux-dev-315480209b8e1032e63c70dafc8f4133b3c9a333.zip | |
Merge branch '5.14/scsi-fixes' into 5.15/scsi-staging
Resolve mpt3sas conflict between 5.14/scsi-fixes and 5.15/scsi-staging
reported by sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index e06a2602fca4..fe22191522a3 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -477,7 +477,8 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, error = shost->hostt->target_alloc(starget); if(error) { - dev_printk(KERN_ERR, dev, "target allocation failed, error %d\n", error); + if (error != -ENXIO) + dev_err(dev, "target allocation failed, error %d\n", error); /* don't want scsi_target_reap to do the final * put because it will be under the host lock */ scsi_target_destroy(starget); |