Commit 0c482202 authored by James Bottomley's avatar James Bottomley

Fix mismerge in megaraid.c

parent 05d088b2
...@@ -2063,8 +2063,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) ...@@ -2063,8 +2063,7 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)
case 0x02: /* ERROR_ABORTED, i.e. case 0x02: /* ERROR_ABORTED, i.e.
SCSI_STATUS_CHECK_CONDITION */ SCSI_STATUS_CHECK_CONDITION */
out:
return IRQ_RETVAL(handled);
/* set sense_buffer and result fields */ /* set sense_buffer and result fields */
if( mbox->cmd == MEGA_MBOXCMD_PASSTHRU || if( mbox->cmd == MEGA_MBOXCMD_PASSTHRU ||
mbox->cmd == MEGA_MBOXCMD_PASSTHRU64 ) { mbox->cmd == MEGA_MBOXCMD_PASSTHRU64 ) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment