4 files changed, 19 insertions, 15 deletions

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 4efbc17a7d7f..8ca488de492d 100644
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -515,8 +515,6 @@ static int fcoe_shost_config(struct fc_lport *lp, struct Scsi_Host *shost,
         int rc = 0;
 
         /* lport scsi host config */
-        lp->host = shost;
-
         lp->host->max_lun = FCOE_MAX_LUN;
         lp->host->max_id = FCOE_MAX_FCP_TARGET;
         lp->host->max_channel = 0;
@@ -734,14 +732,14 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
 
         FCOE_NETDEV_DBG(netdev, "Create Interface\n");
 
-        shost = libfc_host_alloc(&fcoe_shost_template,
+        lport = libfc_host_alloc(&fcoe_shost_template,
                                  sizeof(struct fcoe_port));
-        if (!shost) {
+        if (!lport) {
                 FCOE_NETDEV_DBG(netdev, "Could not allocate host structure\n");
                 rc = -ENOMEM;
                 goto out;
         }
-        lport = shost_priv(shost);
+        shost = lport->host;
         port = lport_priv(lport);
         port->lport = lport;
         port->fcoe = fcoe;
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index fc61f17025ce..018cc427504a 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -424,15 +424,13 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
          * Allocate SCSI Host and set up association between host,
          * local port, and fnic
          */
-        host = scsi_host_alloc(&fnic_host_template,
-                               sizeof(struct fc_lport) + sizeof(struct fnic));
-        if (!host) {
-                printk(KERN_ERR PFX "Unable to alloc SCSI host\n");
+        lp = libfc_host_alloc(&fnic_host_template, sizeof(struct fnic));
+        if (!lp) {
+                printk(KERN_ERR PFX "Unable to alloc libfc local port\n");
                 err = -ENOMEM;
                 goto err_out;
         }
-        lp = shost_priv(host);
-        lp->host = host;
+        host = lp->host;
         fnic = lport_priv(lp);
         fnic->lport = lp;
 
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index f7f20a46e494..41650d336289 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -1505,7 +1505,6 @@ int fc_lport_init(struct fc_lport *lport)
         if (lport->link_supported_speeds & FC_PORTSPEED_10GBIT)
                 fc_host_supported_speeds(lport->host) |= FC_PORTSPEED_10GBIT;
 
-        INIT_LIST_HEAD(&lport->ema_list);
         return 0;
 }
 EXPORT_SYMBOL(fc_lport_init);
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 690f8296e633..ed3057b4e78d 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -739,12 +739,21 @@ static inline void *lport_priv(const struct fc_lport *lp)
  * @sht: ptr to the scsi host templ
  * @priv_size: size of private data after fc_lport
  *
- * Returns: ptr to Scsi_Host
+ * Returns: libfc lport
  */
-static inline struct Scsi_Host *
+static inline struct fc_lport *
 libfc_host_alloc(struct scsi_host_template *sht, int priv_size)
 {
-        return scsi_host_alloc(sht, sizeof(struct fc_lport) + priv_size);
+        struct fc_lport *lport;
+        struct Scsi_Host *shost;
+
+        shost = scsi_host_alloc(sht, sizeof(*lport) + priv_size);
+        if (!shost)
+                return NULL;
+        lport = shost_priv(shost);
+        lport->host = shost;
+        INIT_LIST_HEAD(&lport->ema_list);
+        return lport;
 }
 
 /*