diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-16 18:00:42 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-16 18:00:42 -0500 |
| commit | ec144a81ade915b5b38adedf10e84690813ed768 (patch) | |
| tree | c94b53c971ab2c39e27433267318b3c7bc86ff1b /drivers/message | |
| parent | b919ee827e048826786fd7e889a2b04f63382fe6 (diff) | |
| parent | 88626272549b94310975932a9970d11a9b362a16 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/message')
| -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 | ||