Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / fcoe / fcoe.c

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index d23a538a9dfcca1e5bae286fb8305796dd6a8233..9f9600b6700161231cf815ad030d3a98f0acaae5 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -854,7 +854,6 @@ static void fcoe_if_destroy(struct fc_lport *lport)
 
        /* Cleanup the fc_lport */
        fc_lport_destroy(lport);
-       fc_fcp_destroy(lport);
 
        /* Stop the transmit retry timer */
        del_timer_sync(&port->timer);
@@ -876,6 +875,9 @@ static void fcoe_if_destroy(struct fc_lport *lport)
        fc_remove_host(lport->host);
        scsi_remove_host(lport->host);
 
+       /* Destroy lport scsi_priv */
+       fc_fcp_destroy(lport);
+
        /* There are no more rports or I/O, free the EM */
        fc_exch_mgr_free(lport);