1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 1ba98d255fac..59287601bd41 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -945,15 +945,26 @@ static int
 iscsi_tgt_dscvr(struct iscsi_transport *transport,
                 struct iscsi_uevent *ev)
 {
+        struct Scsi_Host *shost;
         struct sockaddr *dst_addr;
+        int err;
 
         if (!transport->tgt_dscvr)
                 return -EINVAL;
 
+        shost = scsi_host_lookup(ev->u.tgt_dscvr.host_no);
+        if (IS_ERR(shost)) {
+                printk(KERN_ERR "target discovery could not find host no %u\n",
+                       ev->u.tgt_dscvr.host_no);
+                return -ENODEV;
+        }
+
+
         dst_addr = (struct sockaddr *)((char*)ev + sizeof(*ev));
-        return transport->tgt_dscvr(ev->u.tgt_dscvr.type,
-                                    ev->u.tgt_dscvr.host_no,
-                                    ev->u.tgt_dscvr.enable, dst_addr);
+        err = transport->tgt_dscvr(shost, ev->u.tgt_dscvr.type,
+                                   ev->u.tgt_dscvr.enable, dst_addr);
+        scsi_host_put(shost);
+        return err;
 }
 
 static int