Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / fcoe / fcoe.c

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 587d4bbb7d226e77dbc4463f1a56de10e513dcaf..25dae9f0b20550ee4357b04b7eb4eee44a2a6f68 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -1250,15 +1250,21 @@ static int __init fcoe_if_init(void)
        /* attach to scsi transport */
        fcoe_nport_scsi_transport =
                fc_attach_transport(&fcoe_nport_fc_functions);
+       if (!fcoe_nport_scsi_transport)
+               goto err;
+
        fcoe_vport_scsi_transport =
                fc_attach_transport(&fcoe_vport_fc_functions);
-
-       if (!fcoe_nport_scsi_transport) {
-               printk(KERN_ERR "fcoe: Failed to attach to the FC transport\n");
-               return -ENODEV;
-       }
+       if (!fcoe_vport_scsi_transport)
+               goto err_vport;
 
        return 0;
+
+err_vport:
+       fc_release_transport(fcoe_nport_scsi_transport);
+err:
+       printk(KERN_ERR "fcoe: Failed to attach to the FC transport\n");
+       return -ENODEV;
 }
 
 /**
@@ -1617,7 +1623,6 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
        else
                fr_flags(fp) |= FCPHF_CRC_UNCHECKED;
 
-       fh = (struct fc_frame_header *) skb_transport_header(skb);
        fh = fc_frame_header_get(fp);
        if (fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA && fh->fh_type == FC_TYPE_FCP)
                return 0;