diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:31:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:31:27 -0700 |
| commit | 0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch) | |
| tree | 67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /drivers/message/fusion/mptspi.c | |
| parent | db400b3c4ee89d384d9163836a55577abdae772d (diff) | |
| parent | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (diff) | |
| download | blackbird-op-linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.gz blackbird-op-linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
| -rw-r--r-- | drivers/message/fusion/mptspi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index dfa8806b1e13..587d1274fd74 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c @@ -162,15 +162,15 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) u8 *mem; int error=0; int r; - + if ((r = mpt_attach(pdev,id)) != 0) return r; - + ioc = pci_get_drvdata(pdev); ioc->DoneCtx = mptspiDoneCtx; ioc->TaskCtx = mptspiTaskCtx; ioc->InternalCtx = mptspiInternalCtx; - + /* Added sanity check on readiness of the MPT adapter. */ if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) { |
