diff options
| author | Alex Elder <aelder@sgi.com> | 2010-02-26 15:34:02 -0500 |
|---|---|---|
| committer | Alex Elder <aelder@sgi.com> | 2010-02-26 15:34:02 -0500 |
| commit | 398007f863a4af2b4a5a07219c5a617f1a098115 (patch) | |
| tree | 7589f17bfa6645ee0342048bfaede1391a411f2b /drivers/message/fusion/mptscsih.c | |
| parent | d67b1b03254c501fef371b0e5916c94a52bfc2c5 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
Merge branch 'linux-2.6.33'
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
| -rw-r--r-- | drivers/message/fusion/mptscsih.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 57752751712b..81279b3d694c 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -1796,7 +1796,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt) | |||
| 1796 | dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "task abort: " | 1796 | dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT "task abort: " |
| 1797 | "Command not in the active list! (sc=%p)\n", ioc->name, | 1797 | "Command not in the active list! (sc=%p)\n", ioc->name, |
| 1798 | SCpnt)); | 1798 | SCpnt)); |
| 1799 | retval = 0; | 1799 | retval = SUCCESS; |
| 1800 | goto out; | 1800 | goto out; |
| 1801 | } | 1801 | } |
| 1802 | 1802 | ||