2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 3db03dd6b56e..82bcab688b44 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -820,6 +820,7 @@ static struct scsi_host_template ibmvstgt_sht = {
         .eh_abort_handler       = ibmvstgt_eh_abort_handler,
         .shost_attrs            = ibmvstgt_attrs,
         .proc_name              = TGT_NAME,
+        .supported_mode         = MODE_TARGET,
 };
 
 static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id)
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index 430501ef9f02..44a340bd937b 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -222,7 +222,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
                 return ERR_PTR(ret);
         }
 
-        if (ids->roles == SRP_RPORT_ROLE_INITIATOR) {
+        if (shost->active_mode & MODE_TARGET &&
+            ids->roles == SRP_RPORT_ROLE_INITIATOR) {
                 ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
                                               rport->port_id);
                 if (ret) {
@@ -249,10 +250,11 @@ EXPORT_SYMBOL_GPL(srp_rport_add);
 void srp_rport_del(struct srp_rport *rport)
 {
         struct device *dev = &rport->dev;
+        struct Scsi_Host *shost = dev_to_shost(dev->parent);
 
-        if (rport->roles == SRP_RPORT_ROLE_INITIATOR)
-                srp_tgt_it_nexus_destroy(dev_to_shost(dev->parent),
-                                         (unsigned long)rport);
+        if (shost->active_mode & MODE_TARGET &&
+            rport->roles == SRP_RPORT_ROLE_INITIATOR)
+                srp_tgt_it_nexus_destroy(shost, (unsigned long)rport);
 
         transport_remove_device(dev);
         device_del(dev);