7 files changed, 130 insertions, 118 deletions

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index f4ac21e5771e..5afa0e393ecf 100644
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -1,9 +1,6 @@
 
-menu "I2O device support"
-        depends on PCI
-
-config I2O
-        tristate "I2O support"
+menuconfig I2O
+        tristate "I2O device support"
         depends on PCI
         ---help---
           The Intelligent Input/Output (I2O) architecture allows hardware
@@ -25,9 +22,10 @@ config I2O
 
           If unsure, say N.
 
+if I2O
+
 config I2O_LCT_NOTIFY_ON_CHANGES
         bool "Enable LCT notification"
-        depends on I2O
         default y
         ---help---
           Only say N here if you have a I2O controller from SUN. The SUN
@@ -39,7 +37,6 @@ config I2O_LCT_NOTIFY_ON_CHANGES
 
 config I2O_EXT_ADAPTEC
         bool "Enable Adaptec extensions"
-        depends on I2O
         default y
         ---help---
           Say Y for support of raidutils for Adaptec I2O controllers. You also
@@ -57,7 +54,7 @@ config I2O_EXT_ADAPTEC_DMA64
 
 config I2O_CONFIG
         tristate "I2O Configuration support"
-        depends on I2O
+        depends on VIRT_TO_BUS
         ---help---
           Say Y for support of the configuration interface for the I2O adapters.
           If you have a RAID controller from Adaptec and you want to use the
@@ -78,7 +75,6 @@ config I2O_CONFIG_OLD_IOCTL
 
 config I2O_BUS
         tristate "I2O Bus Adapter OSM"
-        depends on I2O
         ---help---
           Include support for the I2O Bus Adapter OSM. The Bus Adapter OSM
           provides access to the busses on the I2O controller. The main purpose
@@ -89,7 +85,7 @@ config I2O_BUS
 
 config I2O_BLOCK
         tristate "I2O Block OSM"
-        depends on I2O && BLOCK
+        depends on BLOCK
         ---help---
           Include support for the I2O Block OSM. The Block OSM presents disk
           and other structured block devices to the operating system. If you
@@ -102,7 +98,7 @@ config I2O_BLOCK
 
 config I2O_SCSI
         tristate "I2O SCSI OSM"
-        depends on I2O && SCSI
+        depends on SCSI
         ---help---
           Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
           I2O controller. You can use both the SCSI and Block OSM together if
@@ -114,7 +110,6 @@ config I2O_SCSI
 
 config I2O_PROC
         tristate "I2O /proc support"
-        depends on I2O
         ---help---
           If you say Y here and to "/proc file system support", you will be
           able to read I2O related information from the virtual directory
@@ -123,5 +118,4 @@ config I2O_PROC
           To compile this support as a module, choose M here: the
           module will be called i2o_proc.
 
-endmenu
-
+endif # I2O
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c
index 8abe45e49ad7..ce62d8bfe1c8 100644
--- a/drivers/message/i2o/debug.c
+++ b/drivers/message/i2o/debug.c
@@ -24,7 +24,7 @@ void i2o_report_status(const char *severity, const char *str,
         if (cmd == I2O_CMD_UTIL_EVT_REGISTER)
                 return;         // No status in this reply
 
-        printk(KERN_DEBUG "%s%s: ", severity, str);
+        printk("%s%s: ", severity, str);
 
         if (cmd < 0x1F)         // Utility cmd
                 i2o_report_util_cmd(cmd);
@@ -32,7 +32,7 @@ void i2o_report_status(const char *severity, const char *str,
         else if (cmd >= 0xA0 && cmd <= 0xEF)    // Executive cmd
                 i2o_report_exec_cmd(cmd);
         else
-                printk(KERN_DEBUG "Cmd = %0#2x, ", cmd);        // Other cmds
+                printk("Cmd = %0#2x, ", cmd);   // Other cmds
 
         if (msg[0] & MSG_FAIL) {
                 i2o_report_fail_status(req_status, msg);
@@ -44,7 +44,7 @@ void i2o_report_status(const char *severity, const char *str,
         if (cmd < 0x1F || (cmd >= 0xA0 && cmd <= 0xEF))
                 i2o_report_common_dsc(detailed_status);
         else
-                printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n",
+                printk(" / DetailedStatus = %0#4x.\n",
                        detailed_status);
 }
 
@@ -89,10 +89,10 @@ static void i2o_report_fail_status(u8 req_status, u32 * msg)
         };
 
         if (req_status == I2O_FSC_TRANSPORT_UNKNOWN_FAILURE)
-                printk(KERN_DEBUG "TRANSPORT_UNKNOWN_FAILURE (%0#2x).\n",
+                printk("TRANSPORT_UNKNOWN_FAILURE (%0#2x).\n",
                        req_status);
         else
-                printk(KERN_DEBUG "TRANSPORT_%s.\n",
+                printk("TRANSPORT_%s.\n",
                        FAIL_STATUS[req_status & 0x0F]);
 
         /* Dump some details */
@@ -104,7 +104,7 @@ static void i2o_report_fail_status(u8 req_status, u32 * msg)
         printk(KERN_ERR "  FailingHostUnit = 0x%04X,  FailingIOP = 0x%03X\n",
                msg[5] >> 16, msg[5] & 0xFFF);
 
-        printk(KERN_ERR "  Severity:  0x%02X ", (msg[4] >> 16) & 0xFF);
+        printk(KERN_ERR "  Severity:  0x%02X\n", (msg[4] >> 16) & 0xFF);
         if (msg[4] & (1 << 16))
                 printk(KERN_DEBUG "(FormatError), "
                        "this msg can never be delivered/processed.\n");
@@ -142,9 +142,9 @@ static void i2o_report_common_status(u8 req_status)
         };
 
         if (req_status >= ARRAY_SIZE(REPLY_STATUS))
-                printk(KERN_DEBUG "RequestStatus = %0#2x", req_status);
+                printk("RequestStatus = %0#2x", req_status);
         else
-                printk(KERN_DEBUG "%s", REPLY_STATUS[req_status]);
+                printk("%s", REPLY_STATUS[req_status]);
 }
 
 /*
@@ -187,10 +187,10 @@ static void i2o_report_common_dsc(u16 detailed_status)
         };
 
         if (detailed_status > I2O_DSC_DEVICE_NOT_AVAILABLE)
-                printk(KERN_DEBUG " / DetailedStatus = %0#4x.\n",
+                printk(" / DetailedStatus = %0#4x.\n",
                        detailed_status);
         else
-                printk(KERN_DEBUG " / %s.\n", COMMON_DSC[detailed_status]);
+                printk(" / %s.\n", COMMON_DSC[detailed_status]);
 }
 
 /*
@@ -200,49 +200,49 @@ static void i2o_report_util_cmd(u8 cmd)
 {
         switch (cmd) {
         case I2O_CMD_UTIL_NOP:
-                printk(KERN_DEBUG "UTIL_NOP, ");
+                printk("UTIL_NOP, ");
                 break;
         case I2O_CMD_UTIL_ABORT:
-                printk(KERN_DEBUG "UTIL_ABORT, ");
+                printk("UTIL_ABORT, ");
                 break;
         case I2O_CMD_UTIL_CLAIM:
-                printk(KERN_DEBUG "UTIL_CLAIM, ");
+                printk("UTIL_CLAIM, ");
                 break;
         case I2O_CMD_UTIL_RELEASE:
-                printk(KERN_DEBUG "UTIL_CLAIM_RELEASE, ");
+                printk("UTIL_CLAIM_RELEASE, ");
                 break;
         case I2O_CMD_UTIL_CONFIG_DIALOG:
-                printk(KERN_DEBUG "UTIL_CONFIG_DIALOG, ");
+                printk("UTIL_CONFIG_DIALOG, ");
                 break;
         case I2O_CMD_UTIL_DEVICE_RESERVE:
-                printk(KERN_DEBUG "UTIL_DEVICE_RESERVE, ");
+                printk("UTIL_DEVICE_RESERVE, ");
                 break;
         case I2O_CMD_UTIL_DEVICE_RELEASE:
-                printk(KERN_DEBUG "UTIL_DEVICE_RELEASE, ");
+                printk("UTIL_DEVICE_RELEASE, ");
                 break;
         case I2O_CMD_UTIL_EVT_ACK:
-                printk(KERN_DEBUG "UTIL_EVENT_ACKNOWLEDGE, ");
+                printk("UTIL_EVENT_ACKNOWLEDGE, ");
                 break;
         case I2O_CMD_UTIL_EVT_REGISTER:
-                printk(KERN_DEBUG "UTIL_EVENT_REGISTER, ");
+                printk("UTIL_EVENT_REGISTER, ");
                 break;
         case I2O_CMD_UTIL_LOCK:
-                printk(KERN_DEBUG "UTIL_LOCK, ");
+                printk("UTIL_LOCK, ");
                 break;
         case I2O_CMD_UTIL_LOCK_RELEASE:
-                printk(KERN_DEBUG "UTIL_LOCK_RELEASE, ");
+                printk("UTIL_LOCK_RELEASE, ");
                 break;
         case I2O_CMD_UTIL_PARAMS_GET:
-                printk(KERN_DEBUG "UTIL_PARAMS_GET, ");
+                printk("UTIL_PARAMS_GET, ");
                 break;
         case I2O_CMD_UTIL_PARAMS_SET:
-                printk(KERN_DEBUG "UTIL_PARAMS_SET, ");
+                printk("UTIL_PARAMS_SET, ");
                 break;
         case I2O_CMD_UTIL_REPLY_FAULT_NOTIFY:
-                printk(KERN_DEBUG "UTIL_REPLY_FAULT_NOTIFY, ");
+                printk("UTIL_REPLY_FAULT_NOTIFY, ");
                 break;
         default:
-                printk(KERN_DEBUG "Cmd = %0#2x, ", cmd);
+                printk("Cmd = %0#2x, ", cmd);
         }
 }
 
@@ -253,106 +253,106 @@ static void i2o_report_exec_cmd(u8 cmd)
 {
         switch (cmd) {
         case I2O_CMD_ADAPTER_ASSIGN:
-                printk(KERN_DEBUG "EXEC_ADAPTER_ASSIGN, ");
+                printk("EXEC_ADAPTER_ASSIGN, ");
                 break;
         case I2O_CMD_ADAPTER_READ:
-                printk(KERN_DEBUG "EXEC_ADAPTER_READ, ");
+                printk("EXEC_ADAPTER_READ, ");
                 break;
         case I2O_CMD_ADAPTER_RELEASE:
-                printk(KERN_DEBUG "EXEC_ADAPTER_RELEASE, ");
+                printk("EXEC_ADAPTER_RELEASE, ");
                 break;
         case I2O_CMD_BIOS_INFO_SET:
-                printk(KERN_DEBUG "EXEC_BIOS_INFO_SET, ");
+                printk("EXEC_BIOS_INFO_SET, ");
                 break;
         case I2O_CMD_BOOT_DEVICE_SET:
-                printk(KERN_DEBUG "EXEC_BOOT_DEVICE_SET, ");
+                printk("EXEC_BOOT_DEVICE_SET, ");
                 break;
         case I2O_CMD_CONFIG_VALIDATE:
-                printk(KERN_DEBUG "EXEC_CONFIG_VALIDATE, ");
+                printk("EXEC_CONFIG_VALIDATE, ");
                 break;
         case I2O_CMD_CONN_SETUP:
-                printk(KERN_DEBUG "EXEC_CONN_SETUP, ");
+                printk("EXEC_CONN_SETUP, ");
                 break;
         case I2O_CMD_DDM_DESTROY:
-                printk(KERN_DEBUG "EXEC_DDM_DESTROY, ");
+                printk("EXEC_DDM_DESTROY, ");
                 break;
         case I2O_CMD_DDM_ENABLE:
-                printk(KERN_DEBUG "EXEC_DDM_ENABLE, ");
+                printk("EXEC_DDM_ENABLE, ");
                 break;
         case I2O_CMD_DDM_QUIESCE:
-                printk(KERN_DEBUG "EXEC_DDM_QUIESCE, ");
+                printk("EXEC_DDM_QUIESCE, ");
                 break;
         case I2O_CMD_DDM_RESET:
-                printk(KERN_DEBUG "EXEC_DDM_RESET, ");
+                printk("EXEC_DDM_RESET, ");
                 break;
         case I2O_CMD_DDM_SUSPEND:
-                printk(KERN_DEBUG "EXEC_DDM_SUSPEND, ");
+                printk("EXEC_DDM_SUSPEND, ");
                 break;
         case I2O_CMD_DEVICE_ASSIGN:
-                printk(KERN_DEBUG "EXEC_DEVICE_ASSIGN, ");
+                printk("EXEC_DEVICE_ASSIGN, ");
                 break;
         case I2O_CMD_DEVICE_RELEASE:
-                printk(KERN_DEBUG "EXEC_DEVICE_RELEASE, ");
+                printk("EXEC_DEVICE_RELEASE, ");
                 break;
         case I2O_CMD_HRT_GET:
-                printk(KERN_DEBUG "EXEC_HRT_GET, ");
+                printk("EXEC_HRT_GET, ");
                 break;
         case I2O_CMD_ADAPTER_CLEAR:
-                printk(KERN_DEBUG "EXEC_IOP_CLEAR, ");
+                printk("EXEC_IOP_CLEAR, ");
                 break;
         case I2O_CMD_ADAPTER_CONNECT:
-                printk(KERN_DEBUG "EXEC_IOP_CONNECT, ");
+                printk("EXEC_IOP_CONNECT, ");
                 break;
         case I2O_CMD_ADAPTER_RESET:
-                printk(KERN_DEBUG "EXEC_IOP_RESET, ");
+                printk("EXEC_IOP_RESET, ");
                 break;
         case I2O_CMD_LCT_NOTIFY:
-                printk(KERN_DEBUG "EXEC_LCT_NOTIFY, ");
+                printk("EXEC_LCT_NOTIFY, ");
                 break;
         case I2O_CMD_OUTBOUND_INIT:
-                printk(KERN_DEBUG "EXEC_OUTBOUND_INIT, ");
+                printk("EXEC_OUTBOUND_INIT, ");
                 break;
         case I2O_CMD_PATH_ENABLE:
-                printk(KERN_DEBUG "EXEC_PATH_ENABLE, ");
+                printk("EXEC_PATH_ENABLE, ");
                 break;
         case I2O_CMD_PATH_QUIESCE:
-                printk(KERN_DEBUG "EXEC_PATH_QUIESCE, ");
+                printk("EXEC_PATH_QUIESCE, ");
                 break;
         case I2O_CMD_PATH_RESET:
-                printk(KERN_DEBUG "EXEC_PATH_RESET, ");
+                printk("EXEC_PATH_RESET, ");
                 break;
         case I2O_CMD_STATIC_MF_CREATE:
-                printk(KERN_DEBUG "EXEC_STATIC_MF_CREATE, ");
+                printk("EXEC_STATIC_MF_CREATE, ");
                 break;
         case I2O_CMD_STATIC_MF_RELEASE:
-                printk(KERN_DEBUG "EXEC_STATIC_MF_RELEASE, ");
+                printk("EXEC_STATIC_MF_RELEASE, ");
                 break;
         case I2O_CMD_STATUS_GET:
-                printk(KERN_DEBUG "EXEC_STATUS_GET, ");
+                printk("EXEC_STATUS_GET, ");
                 break;
         case I2O_CMD_SW_DOWNLOAD:
-                printk(KERN_DEBUG "EXEC_SW_DOWNLOAD, ");
+                printk("EXEC_SW_DOWNLOAD, ");
                 break;
         case I2O_CMD_SW_UPLOAD:
-                printk(KERN_DEBUG "EXEC_SW_UPLOAD, ");
+                printk("EXEC_SW_UPLOAD, ");
                 break;
         case I2O_CMD_SW_REMOVE:
-                printk(KERN_DEBUG "EXEC_SW_REMOVE, ");
+                printk("EXEC_SW_REMOVE, ");
                 break;
         case I2O_CMD_SYS_ENABLE:
-                printk(KERN_DEBUG "EXEC_SYS_ENABLE, ");
+                printk("EXEC_SYS_ENABLE, ");
                 break;
         case I2O_CMD_SYS_MODIFY:
-                printk(KERN_DEBUG "EXEC_SYS_MODIFY, ");
+                printk("EXEC_SYS_MODIFY, ");
                 break;
         case I2O_CMD_SYS_QUIESCE:
-                printk(KERN_DEBUG "EXEC_SYS_QUIESCE, ");
+                printk("EXEC_SYS_QUIESCE, ");
                 break;
         case I2O_CMD_SYS_TAB_SET:
-                printk(KERN_DEBUG "EXEC_SYS_TAB_SET, ");
+                printk("EXEC_SYS_TAB_SET, ");
                 break;
         default:
-                printk(KERN_DEBUG "Cmd = %#02x, ", cmd);
+                printk("Cmd = %#02x, ", cmd);
         }
 }
 
@@ -361,28 +361,28 @@ void i2o_debug_state(struct i2o_controller *c)
         printk(KERN_INFO "%s: State = ", c->name);
         switch (((i2o_status_block *) c->status_block.virt)->iop_state) {
         case 0x01:
-                printk(KERN_DEBUG "INIT\n");
+                printk("INIT\n");
                 break;
         case 0x02:
-                printk(KERN_DEBUG "RESET\n");
+                printk("RESET\n");
                 break;
         case 0x04:
-                printk(KERN_DEBUG "HOLD\n");
+                printk("HOLD\n");
                 break;
         case 0x05:
-                printk(KERN_DEBUG "READY\n");
+                printk("READY\n");
                 break;
         case 0x08:
-                printk(KERN_DEBUG "OPERATIONAL\n");
+                printk("OPERATIONAL\n");
                 break;
         case 0x10:
-                printk(KERN_DEBUG "FAILED\n");
+                printk("FAILED\n");
                 break;
         case 0x11:
-                printk(KERN_DEBUG "FAULTED\n");
+                printk("FAULTED\n");
                 break;
         default:
-                printk(KERN_DEBUG "%x (unknown !!)\n",
+                printk("%x (unknown !!)\n",
                        ((i2o_status_block *) c->status_block.virt)->iop_state);
         }
 };
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index 611adc3c0f74..489d7c5c4965 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -62,7 +62,7 @@ int i2o_device_claim(struct i2o_device *dev)
 {
         int rc = 0;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
 
         rc = i2o_device_issue_claim(dev, I2O_CMD_UTIL_CLAIM, I2O_CLAIM_PRIMARY);
         if (!rc)
@@ -72,7 +72,7 @@ int i2o_device_claim(struct i2o_device *dev)
                 pr_debug("i2o: claim of device %d failed %d\n",
                          dev->lct_data.tid, rc);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         return rc;
 }
@@ -96,7 +96,7 @@ int i2o_device_claim_release(struct i2o_device *dev)
         int tries;
         int rc = 0;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
 
         /*
          *      If the controller takes a nonblocking approach to
@@ -118,7 +118,7 @@ int i2o_device_claim_release(struct i2o_device *dev)
                 pr_debug("i2o: claim release of device %d failed %d\n",
                          dev->lct_data.tid, rc);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         return rc;
 }
@@ -198,7 +198,7 @@ static struct i2o_device *i2o_device_alloc(void)
                 return ERR_PTR(-ENOMEM);
 
         INIT_LIST_HEAD(&dev->list);
-        init_MUTEX(&dev->lock);
+        mutex_init(&dev->lock);
 
         dev->device.bus = &i2o_bus_type;
         dev->device.release = &i2o_device_release;
@@ -326,7 +326,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
         u16 table_size;
         u32 buf;
 
-        down(&c->lct_lock);
+        mutex_lock(&c->lct_lock);
 
         kfree(c->lct);
 
@@ -335,7 +335,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
 
         lct = c->lct = kmalloc(table_size * 4, GFP_KERNEL);
         if (!lct) {
-                up(&c->lct_lock);
+                mutex_unlock(&c->lct_lock);
                 return -ENOMEM;
         }
 
@@ -408,7 +408,7 @@ int i2o_device_parse_lct(struct i2o_controller *c)
                         i2o_device_remove(dev);
         }
 
-        up(&c->lct_lock);
+        mutex_unlock(&c->lct_lock);
 
         return 0;
 }
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index 5278aad92bc4..8c83ee3b0920 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -131,8 +131,10 @@ int i2o_msg_post_wait_mem(struct i2o_controller *c, struct i2o_message *msg,
         int rc = 0;
 
         wait = i2o_exec_wait_alloc();
-        if (!wait)
+        if (!wait) {
+                i2o_msg_nop(c, msg);
                 return -ENOMEM;
+        }
 
         if (tcntxt == 0xffffffff)
                 tcntxt = 0x80000000;
@@ -337,6 +339,8 @@ static int i2o_exec_probe(struct device *dev)
         rc = device_create_file(dev, &dev_attr_product_id);
         if (rc) goto err_vid;
 
+        i2o_dev->iop->exec = i2o_dev;
+
         return 0;
 
 err_vid:
@@ -537,7 +541,7 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
         struct device *dev;
         struct i2o_message *msg;
 
-        down(&c->lct_lock);
+        mutex_lock(&c->lct_lock);
 
         dev = &c->pdev->dev;
 
@@ -561,7 +565,7 @@ static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
 
         i2o_msg_post(c, msg);
 
-        up(&c->lct_lock);
+        mutex_unlock(&c->lct_lock);
 
         return 0;
 };
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index b17c4b2bc9ef..64a52bd7544a 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -215,7 +215,7 @@ static int i2o_block_device_lock(struct i2o_device *dev, u32 media_id)
         struct i2o_message *msg;
 
         msg = i2o_msg_get_wait(dev->iop, I2O_TIMEOUT_MESSAGE_GET);
-        if (IS_ERR(msg) == I2O_QUEUE_EMPTY)
+        if (IS_ERR(msg))
                 return PTR_ERR(msg);
 
         msg->u.head[0] = cpu_to_le32(FIVE_WORD_MSG_SIZE | SGL_OFFSET_0);
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 8ba275a12773..84e046e94f5f 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -554,8 +554,6 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                 return -ENXIO;
         }
 
-        msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
-
         sb = c->status_block.virt;
 
         if (get_user(size, &user_msg[0])) {
@@ -573,24 +571,30 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
 
         size <<= 2;             // Convert to bytes
 
+        msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
+        if (IS_ERR(msg))
+                return PTR_ERR(msg);
+
+        rcode = -EFAULT;
         /* Copy in the user's I2O command */
         if (copy_from_user(msg, user_msg, size)) {
                 osm_warn("unable to copy user message\n");
-                return -EFAULT;
+                goto out;
         }
         i2o_dump_message(msg);
 
         if (get_user(reply_size, &user_reply[0]) < 0)
-                return -EFAULT;
+                goto out;
 
         reply_size >>= 16;
         reply_size <<= 2;
 
+        rcode = -ENOMEM;
         reply = kzalloc(reply_size, GFP_KERNEL);
         if (!reply) {
                 printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
                        c->name);
-                return -ENOMEM;
+                goto out;
         }
 
         sg_offset = (msg->u.head[0] >> 4) & 0x0f;
@@ -661,13 +665,14 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
         }
 
         rcode = i2o_msg_post_wait(c, msg, 60);
+        msg = NULL;
         if (rcode) {
                 reply[4] = ((u32) rcode) << 24;
                 goto sg_list_cleanup;
         }
 
         if (sg_offset) {
-                u32 msg[I2O_OUTBOUND_MSG_FRAME_SIZE];
+                u32 rmsg[I2O_OUTBOUND_MSG_FRAME_SIZE];
                 /* Copy back the Scatter Gather buffers back to user space */
                 u32 j;
                 // TODO 64bit fix
@@ -675,7 +680,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                 int sg_size;
 
                 // re-acquire the original message to handle correctly the sg copy operation
-                memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
+                memset(&rmsg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
                 // get user msg size in u32s
                 if (get_user(size, &user_msg[0])) {
                         rcode = -EFAULT;
@@ -684,7 +689,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                 size = size >> 16;
                 size *= 4;
                 /* Copy in the user's I2O command */
-                if (copy_from_user(msg, user_msg, size)) {
+                if (copy_from_user(rmsg, user_msg, size)) {
                         rcode = -EFAULT;
                         goto sg_list_cleanup;
                 }
@@ -692,7 +697,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                     (size - sg_offset * 4) / sizeof(struct sg_simple_element);
 
                 // TODO 64bit fix
-                sg = (struct sg_simple_element *)(msg + sg_offset);
+                sg = (struct sg_simple_element *)(rmsg + sg_offset);
                 for (j = 0; j < sg_count; j++) {
                         /* Copy out the SG list to user's buffer if necessary */
                         if (!
@@ -714,7 +719,7 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                 }
         }
 
-      sg_list_cleanup:
+sg_list_cleanup:
         /* Copy back the reply to user space */
         if (reply_size) {
                 // we wrote our own values for context - now restore the user supplied ones
@@ -723,7 +728,6 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                                "%s: Could not copy message context FROM user\n",
                                c->name);
                         rcode = -EFAULT;
-                        goto sg_list_cleanup;
                 }
                 if (copy_to_user(user_reply, reply, reply_size)) {
                         printk(KERN_WARNING
@@ -731,12 +735,14 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                         rcode = -EFAULT;
                 }
         }
-
         for (i = 0; i < sg_index; i++)
                 i2o_dma_free(&c->pdev->dev, &sg_list[i]);
 
-      cleanup:
+cleanup:
         kfree(reply);
+out:
+        if (msg)
+                i2o_msg_nop(c, msg);
         return rcode;
 }
 
@@ -793,8 +799,6 @@ static int i2o_cfg_passthru(unsigned long arg)
                 return -ENXIO;
         }
 
-        msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
-
         sb = c->status_block.virt;
 
         if (get_user(size, &user_msg[0]))
@@ -810,12 +814,17 @@ static int i2o_cfg_passthru(unsigned long arg)
 
         size <<= 2;             // Convert to bytes
 
+        msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
+        if (IS_ERR(msg))
+                return PTR_ERR(msg);
+
+        rcode = -EFAULT;
         /* Copy in the user's I2O command */
         if (copy_from_user(msg, user_msg, size))
-                return -EFAULT;
+                goto out;
 
         if (get_user(reply_size, &user_reply[0]) < 0)
-                return -EFAULT;
+                goto out;
 
         reply_size >>= 16;
         reply_size <<= 2;
@@ -824,7 +833,8 @@ static int i2o_cfg_passthru(unsigned long arg)
         if (!reply) {
                 printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
                        c->name);
-                return -ENOMEM;
+                rcode = -ENOMEM;
+                goto out;
         }
 
         sg_offset = (msg->u.head[0] >> 4) & 0x0f;
@@ -891,13 +901,14 @@ static int i2o_cfg_passthru(unsigned long arg)
         }
 
         rcode = i2o_msg_post_wait(c, msg, 60);
+        msg = NULL;
         if (rcode) {
                 reply[4] = ((u32) rcode) << 24;
                 goto sg_list_cleanup;
         }
 
         if (sg_offset) {
-                u32 msg[128];
+                u32 rmsg[128];
                 /* Copy back the Scatter Gather buffers back to user space */
                 u32 j;
                 // TODO 64bit fix
@@ -905,7 +916,7 @@ static int i2o_cfg_passthru(unsigned long arg)
                 int sg_size;
 
                 // re-acquire the original message to handle correctly the sg copy operation
-                memset(&msg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
+                memset(&rmsg, 0, I2O_OUTBOUND_MSG_FRAME_SIZE * 4);
                 // get user msg size in u32s
                 if (get_user(size, &user_msg[0])) {
                         rcode = -EFAULT;
@@ -914,7 +925,7 @@ static int i2o_cfg_passthru(unsigned long arg)
                 size = size >> 16;
                 size *= 4;
                 /* Copy in the user's I2O command */
-                if (copy_from_user(msg, user_msg, size)) {
+                if (copy_from_user(rmsg, user_msg, size)) {
                         rcode = -EFAULT;
                         goto sg_list_cleanup;
                 }
@@ -922,7 +933,7 @@ static int i2o_cfg_passthru(unsigned long arg)
                     (size - sg_offset * 4) / sizeof(struct sg_simple_element);
 
                 // TODO 64bit fix
-                sg = (struct sg_simple_element *)(msg + sg_offset);
+                sg = (struct sg_simple_element *)(rmsg + sg_offset);
                 for (j = 0; j < sg_count; j++) {
                         /* Copy out the SG list to user's buffer if necessary */
                         if (!
@@ -944,7 +955,7 @@ static int i2o_cfg_passthru(unsigned long arg)
                 }
         }
 
-      sg_list_cleanup:
+sg_list_cleanup:
         /* Copy back the reply to user space */
         if (reply_size) {
                 // we wrote our own values for context - now restore the user supplied ones
@@ -964,8 +975,11 @@ static int i2o_cfg_passthru(unsigned long arg)
         for (i = 0; i < sg_index; i++)
                 kfree(sg_list[i]);
 
-      cleanup:
+cleanup:
         kfree(reply);
+out:
+        if (msg)
+                i2o_msg_nop(c, msg);
         return rcode;
 }
 #endif
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 3305c12372a2..a1ec16a075c6 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -1067,7 +1067,7 @@ struct i2o_controller *i2o_iop_alloc(void)
 
         INIT_LIST_HEAD(&c->devices);
         spin_lock_init(&c->lock);
-        init_MUTEX(&c->lct_lock);
+        mutex_init(&c->lct_lock);
 
         device_initialize(&c->device);