projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] ipr: Stop issuing cancel all to disk arrays
[powerpc.git]
/
drivers
/
scsi
/
sun3x_esp.c
diff --git
a/drivers/scsi/sun3x_esp.c
b/drivers/scsi/sun3x_esp.c
index
2e2c1eb
..
6b60536
100644
(file)
--- a/
drivers/scsi/sun3x_esp.c
+++ b/
drivers/scsi/sun3x_esp.c
@@
-97,7
+97,7
@@
int sun3x_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command);
esp->irq = 2;
esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command);
esp->irq = 2;
- if (request_irq(esp->irq, esp_intr,
SA_INTERRUPT,
+ if (request_irq(esp->irq, esp_intr,
IRQF_DISABLED,
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
@@
-347,7
+347,7
@@
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
int sz = sp->use_sg - 1;
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
int sz = sp->use_sg - 1;
- struct scatterlist *sg = (struct scatterlist *)sp->buffer;
+ struct scatterlist *sg = (struct scatterlist *)sp->
request_
buffer;
while(sz >= 0) {
dvma_unmap((char *)sg[sz].dma_address);
while(sz >= 0) {
dvma_unmap((char *)sg[sz].dma_address);