Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / drivers / scsi / scsi_transport_sas.c

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index b6f9581..3f0ff07 100644 (file)
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -1614,7 +1614,8 @@ int sas_rphy_add(struct sas_rphy *rphy)
                else
                        lun = 0;
 
-               scsi_scan_target(&rphy->dev, 0, rphy->scsi_target_id, lun, 0);
+               scsi_scan_target(&rphy->dev, 0, rphy->scsi_target_id, lun,
+                                SCSI_SCAN_INITIAL);
        }
 
        return 0;
@@ -1739,8 +1740,8 @@ static int sas_user_scan(struct Scsi_Host *shost, uint channel,
 
                if ((channel == SCAN_WILD_CARD || channel == 0) &&
                    (id == SCAN_WILD_CARD || id == rphy->scsi_target_id)) {
-                       scsi_scan_target(&rphy->dev, 0,
-                                        rphy->scsi_target_id, lun, 1);
+                       scsi_scan_target(&rphy->dev, 0, rphy->scsi_target_id,
+                                        lun, SCSI_SCAN_MANUAL);
                }
        }
        mutex_unlock(&sas_host->lock);