diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /drivers/scsi/atp870u.c | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/atp870u.c')
| -rw-r--r-- | drivers/scsi/atp870u.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index a198d86667e..3ee4d4d3f44 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c | |||
| @@ -473,7 +473,7 @@ go_42: | |||
| 473 | */ | 473 | */ |
| 474 | if (workreq->use_sg) { | 474 | if (workreq->use_sg) { |
| 475 | pci_unmap_sg(dev->pdev, | 475 | pci_unmap_sg(dev->pdev, |
| 476 | (struct scatterlist *)workreq->buffer, | 476 | (struct scatterlist *)workreq->request_buffer, |
| 477 | workreq->use_sg, | 477 | workreq->use_sg, |
| 478 | workreq->sc_data_direction); | 478 | workreq->sc_data_direction); |
| 479 | } else if (workreq->request_bufflen && | 479 | } else if (workreq->request_bufflen && |
| @@ -3047,7 +3047,7 @@ flash_ok_885: | |||
| 3047 | if (atp_dev.chip_ver == 4) | 3047 | if (atp_dev.chip_ver == 4) |
| 3048 | shpnt->max_id = 16; | 3048 | shpnt->max_id = 16; |
| 3049 | else | 3049 | else |
| 3050 | shpnt->max_id = 7; | 3050 | shpnt->max_id = 8; |
| 3051 | shpnt->this_id = host_id; | 3051 | shpnt->this_id = host_id; |
| 3052 | shpnt->unique_id = base_io; | 3052 | shpnt->unique_id = base_io; |
| 3053 | shpnt->io_port = base_io; | 3053 | shpnt->io_port = base_io; |