2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index bfda731696f7..0c303c84b37b 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1481,15 +1481,15 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 
         ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
         if (pci_enable_device_mem(pdev)) {
-                kfree(ioc);
                 printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
                        "failed\n", ioc->name);
+                kfree(ioc);
                 return r;
         }
         if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
-                kfree(ioc);
                 printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
                        "MEM failed\n", ioc->name);
+                kfree(ioc);
                 return r;
         }
 
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index d83ea96fe135..caadc68c3000 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -923,7 +923,7 @@ extern struct proc_dir_entry	*mpt_proc_root_dir;
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 #endif          /* } __KERNEL__ */
 
-#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__powerpc__)
+#ifdef CONFIG_64BIT
 #define CAST_U32_TO_PTR(x)      ((void *)(u64)x)
 #define CAST_PTR_TO_U32(x)      ((u32)(u64)x)
 #else