diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/scsi/initio.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/scsi/initio.c')
| -rw-r--r-- | drivers/scsi/initio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c index a7714160fbc3..108797761b95 100644 --- a/drivers/scsi/initio.c +++ b/drivers/scsi/initio.c | |||
| @@ -2817,7 +2817,6 @@ static void i91uSCBPost(u8 * host_mem, u8 * cblk_mem) | |||
| 2817 | } | 2817 | } |
| 2818 | 2818 | ||
| 2819 | cmnd->result = cblk->tastat | (cblk->hastat << 16); | 2819 | cmnd->result = cblk->tastat | (cblk->hastat << 16); |
| 2820 | WARN_ON(cmnd == NULL); | ||
| 2821 | i91u_unmap_scb(host->pci_dev, cmnd); | 2820 | i91u_unmap_scb(host->pci_dev, cmnd); |
| 2822 | cmnd->scsi_done(cmnd); /* Notify system DONE */ | 2821 | cmnd->scsi_done(cmnd); /* Notify system DONE */ |
| 2823 | initio_release_scb(host, cblk); /* Release SCB for current channel */ | 2822 | initio_release_scb(host, cblk); /* Release SCB for current channel */ |