1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 02a3eefd6931..d8bf84aef602 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -204,7 +204,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
          || (loops > 0 && ioc->active == 0)) {
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                        "mptfc_block_error_handler.%d: %d:%d, port status is "
+                        "mptfc_block_error_handler.%d: %d:%llu, port status is "
                         "%x, active flag %d, deferring %s recovery.\n",
                         ioc->name, ioc->sh->host_no,
                         SCpnt->device->id, SCpnt->device->lun,
@@ -218,7 +218,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
         if (ready == DID_NO_CONNECT || !SCpnt->device->hostdata
          || ioc->active == 0) {
                 dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                        "%s.%d: %d:%d, failing recovery, "
+                        "%s.%d: %d:%llu, failing recovery, "
                         "port state %x, active %d, vdevice %p.\n", caller,
                         ioc->name, ioc->sh->host_no,
                         SCpnt->device->id, SCpnt->device->lun, ready,
@@ -226,7 +226,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
                 return FAILED;
         }
         dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                "%s.%d: %d:%d, executing recovery.\n", caller,
+                "%s.%d: %d:%llu, executing recovery.\n", caller,
                 ioc->name, ioc->sh->host_no,
                 SCpnt->device->id, SCpnt->device->lun));
         return (*func)(SCpnt);
@@ -525,8 +525,7 @@ mptfc_target_destroy(struct scsi_target *starget)
                 if (ri) /* better be! */
                         ri->starget = NULL;
         }
-        if (starget->hostdata)
-                kfree(starget->hostdata);
+        kfree(starget->hostdata);
         starget->hostdata = NULL;
 }