3 files changed, 14 insertions, 5 deletions

diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index f71f22948477..1735c84ff757 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -76,8 +76,8 @@
 #define COPYRIGHT       "Copyright (c) 1999-2008 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.04.17"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.17"
+#define MPT_LINUX_VERSION_COMMON        "3.04.18"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.18"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index a3856ed90aef..e8deb8ed0499 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -597,6 +597,13 @@ mptctl_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply)
 }
 
 static int
+mptctl_release(struct inode *inode, struct file *filep)
+{
+        fasync_helper(-1, filep, 0, &async_queue);
+        return 0;
+}
+
+static int
 mptctl_fasync(int fd, struct file *filep, int mode)
 {
         MPT_ADAPTER     *ioc;
@@ -2815,6 +2822,7 @@ static const struct file_operations mptctl_fops = {
         .llseek =       no_llseek,
         .fasync =       mptctl_fasync,
         .unlocked_ioctl = mptctl_ioctl,
+        .release =      mptctl_release,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = compat_mpctl_ioctl,
 #endif
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 59b8f53d1ece..0d9b82a44540 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1873,8 +1873,9 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
         }
 
  out:
-        printk(MYIOC_s_INFO_FMT "task abort: %s (sc=%p)\n",
-            ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), SCpnt);
+        printk(MYIOC_s_INFO_FMT "task abort: %s (rv=%04x) (sc=%p) (sn=%ld)\n",
+            ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), retval,
+            SCpnt, SCpnt->serial_number);
 
         return retval;
 }
@@ -1911,7 +1912,7 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
 
         vdevice = SCpnt->device->hostdata;
         if (!vdevice || !vdevice->vtarget) {
-                retval = SUCCESS;
+                retval = 0;
                 goto out;
         }