diff --git a/qla_isp/linux/isp_cb_ops.c b/qla_isp/linux/isp_cb_ops.c
index b0ce32268..19993f87f 100644
--- a/qla_isp/linux/isp_cb_ops.c
+++ b/qla_isp/linux/isp_cb_ops.c
@@ -1,4 +1,4 @@
-/* $Id: isp_cb_ops.c,v 1.84 2008/01/08 18:31:21 mjacob Exp $ */
+/* $Id: isp_cb_ops.c,v 1.85 2008/01/14 18:39:10 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
@@ -627,7 +627,7 @@ isp_ioctl(struct inode *ip, struct file *fp, unsigned int c, unsigned long arg)
         }
         ISP_LOCK_SOFTC(isp);
         lp = &FCPARAM(isp, ifc->chan)->portdb[ifc->loopid];
-        if (lp->state == FC_PORTDB_STATE_VALID) {
+        if (lp->state == FC_PORTDB_STATE_VALID || lp->target_mode) {
             ifc->role = lp->roles;
             ifc->loopid = lp->handle;
             ifc->portid = lp->portid;
diff --git a/qla_isp/linux/isp_linux.h b/qla_isp/linux/isp_linux.h
index 24c307efb..c3b29b572 100644
--- a/qla_isp/linux/isp_linux.h
+++ b/qla_isp/linux/isp_linux.h
@@ -1,4 +1,4 @@
-/* $Id: isp_linux.h,v 1.150 2008/01/13 21:18:01 mjacob Exp $ */
+/* $Id: isp_linux.h,v 1.151 2008/01/14 17:28:09 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
@@ -447,7 +447,7 @@ struct isposinfo {
 #define MAXISPREQUEST(isp)  ((IS_FC(isp) || IS_ULTRA2(isp))? 1024 : 256)
 
 #if   defined(__powerpc__)
-#define`MEMORYBARRIER(isp, type, offset, size)  __asm__ __volatile__("eieio" ::: "memory")
+#define MEMORYBARRIER(isp, type, offset, size)  __asm__ __volatile__("eieio" ::: "memory")
 #else
 #  ifdef mb
 #    define MEMORYBARRIER(isp, type, offset, size)  mb()
diff --git a/qla_isp/linux/isp_pci.c b/qla_isp/linux/isp_pci.c
index 44f4be4ea..dbad0dbf6 100644
--- a/qla_isp/linux/isp_pci.c
+++ b/qla_isp/linux/isp_pci.c
@@ -1,4 +1,4 @@
-/* $Id: isp_pci.c,v 1.152 2008/01/13 21:18:01 mjacob Exp $ */
+/* $Id: isp_pci.c,v 1.153 2008/01/14 00:25:53 mjacob Exp $ */
 /*
  *  Copyright (c) 1997-2007 by Matthew Jacob
  *  All rights reserved.
@@ -737,9 +737,9 @@ isplinux_pci_init_one(struct Scsi_Host *host)
         isp->isp_type = ISP_HA_FC_2322;
         fwname = "ql2322_fw.bin";
     }
-    if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP6312) {
+    if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP6322) {
         isp->isp_mdvec = &mdvec_2300;
-        isp->isp_type = ISP_HA_FC_2312;
+        isp->isp_type = ISP_HA_FC_2322;
         fwname = "ql2322_fw.bin";
     }
 #endif