From 33efe991fe32e458dcb64068646d14e2916ea0ce Mon Sep 17 00:00:00 2001 From: Robert Love Date: Fri, 27 Feb 2009 10:56:06 -0800 Subject: [PATCH] --- yaml --- r: 132331 b: refs/heads/master c: 03ec862dff57ca3d1fcb439b99aadc45bc5c2f28 h: refs/heads/master i: 132329: 3a556287d60de74eb19a410191da484734acc532 132327: a0372842784d64be6843c930f1c83fee9ffb55bd v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/fc_transport_fcoe.c | 3 --- trunk/drivers/scsi/fcoe/fcoe_sw.c | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a642d38211f..e7445e7f35e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a468f328ad83f14556e5961ef1de80b32b428d32 +refs/heads/master: 03ec862dff57ca3d1fcb439b99aadc45bc5c2f28 diff --git a/trunk/drivers/scsi/fcoe/fc_transport_fcoe.c b/trunk/drivers/scsi/fcoe/fc_transport_fcoe.c index 847453a70c62..8862758006c0 100644 --- a/trunk/drivers/scsi/fcoe/fc_transport_fcoe.c +++ b/trunk/drivers/scsi/fcoe/fc_transport_fcoe.c @@ -258,9 +258,6 @@ int fcoe_transport_register(struct fcoe_transport *t) list_add_tail(&t->list, &fcoe_transports); mutex_unlock(&fcoe_transports_lock); - mutex_init(&t->devlock); - INIT_LIST_HEAD(&t->devlist); - printk(KERN_DEBUG "fcoe_transport_register:%s\n", t->name); return 0; diff --git a/trunk/drivers/scsi/fcoe/fcoe_sw.c b/trunk/drivers/scsi/fcoe/fcoe_sw.c index f667dce1bbba..37d359db1648 100644 --- a/trunk/drivers/scsi/fcoe/fcoe_sw.c +++ b/trunk/drivers/scsi/fcoe/fcoe_sw.c @@ -467,10 +467,15 @@ int __init fcoe_sw_init(void) /* attach to scsi transport */ scsi_transport_fcoe_sw = fc_attach_transport(&fcoe_sw_transport_function); + if (!scsi_transport_fcoe_sw) { printk(KERN_ERR "fcoe_sw_init:fc_attach_transport() failed\n"); return -ENODEV; } + + mutex_init(&fcoe_sw_transport.devlock); + INIT_LIST_HEAD(&fcoe_sw_transport.devlist); + /* register sw transport */ fcoe_transport_register(&fcoe_sw_transport); return 0;