Commit 3ca1a0bb authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] Fix stupid scsi setup bug in 53c406, fix addressing

parent 98fb18b1
......@@ -459,7 +459,7 @@ static __inline__ int NCR53c406a_pio_write(unsigned char *request,
int __init
NCR53c406a_detect(Scsi_Host_Template * tpnt){
struct Scsi_Host *shpnt;
struct Scsi_Host *shpnt = NULL;
#ifndef PORT_BASE
int i;
#endif
......@@ -536,10 +536,19 @@ NCR53c406a_detect(Scsi_Host_Template * tpnt){
DEB(printk("NCR53c406a: using port_base %x\n", port_base));
tpnt->present = 1;
tpnt->proc_name = "NCR53c406a";
shpnt = scsi_register(tpnt, 0);
if (!shpnt) {
printk("NCR53c406a: Unable to register host, giving up.\n");
goto err_release;
}
if(irq_level > 0) {
if(request_irq(irq_level, do_NCR53c406a_intr, 0, "NCR53c406a", shpnt)){
printk("NCR53c406a: unable to allocate IRQ %d\n", irq_level);
goto err_release;
goto err_free_scsi;
}
tpnt->can_queue = 1;
DEB(printk("NCR53c406a: allocated IRQ %d\n", irq_level));
......@@ -549,32 +558,24 @@ NCR53c406a_detect(Scsi_Host_Template * tpnt){
DEB(printk("NCR53c406a: No interrupts detected\n"));
#if USE_DMA
printk("NCR53c406a: No interrupts found and DMA mode defined. Giving up.\n");
goto err_release;
goto err_free_scsi;
#endif /* USE_DMA */
}
else {
DEB(printk("NCR53c406a: Shouldn't get here!\n"));
goto err_free_irq;
goto err_free_scsi;
}
#if USE_DMA
dma_chan = DMA_CHAN;
if(request_dma(dma_chan, "NCR53c406a") != 0){
printk("NCR53c406a: unable to allocate DMA channel %d\n", dma_chan);
goto err_release;
goto err_free_irq;
}
DEB(printk("Allocated DMA channel %d\n", dma_chan));
#endif /* USE_DMA */
tpnt->present = 1;
tpnt->proc_name = "NCR53c406a";
shpnt = scsi_register(tpnt, 0);
if (!shpnt) {
printk("NCR53c406a: Unable to register host, giving up.\n");
goto err_free_dma;
}
shpnt->irq = irq_level;
shpnt->io_port = port_base;
shpnt->n_io_port = 0x10;
......@@ -592,13 +593,13 @@ NCR53c406a_detect(Scsi_Host_Template * tpnt){
return (tpnt->present);
err_free_dma:
#if USE_DMA
free_dma(dma_chan);
#endif
err_free_irq:
free_irq(irq_level, do_NCR53c406a_intr);
if(irq_level)
free_irq(irq_level, shpnt);
#endif
err_free_scsi:
scsi_unregister(shpnt);
err_release:
release_region(port_base, 0x10);
return 0;
......@@ -896,7 +897,7 @@ NCR53c406a_intr(int unused, void *dev_id, struct pt_regs *regs){
sgcount = current_SC->use_sg;
sglist = current_SC->request_buffer;
while( sgcount-- ) {
NCR53c406a_pio_write(sglist->address, sglist->length);
NCR53c406a_pio_write(page_address(sglist->page) + sglist->offset, sglist->length);
sglist++;
}
}
......@@ -925,7 +926,7 @@ NCR53c406a_intr(int unused, void *dev_id, struct pt_regs *regs){
sgcount = current_SC->use_sg;
sglist = current_SC->request_buffer;
while( sgcount-- ) {
NCR53c406a_pio_read(sglist->address, sglist->length);
NCR53c406a_pio_read(page_address(sglist->page) + sglist->offset, sglist->length);
sglist++;
}
}
......
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