patch-2.1.126 linux/drivers/scsi/u14-34f.c

Next file: linux/drivers/scsi/wd7000.c
Previous file: linux/drivers/scsi/sd_ioctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.125/linux/drivers/scsi/u14-34f.c linux/drivers/scsi/u14-34f.c
@@ -844,12 +844,17 @@
       bus_type = "VESA";
       }
    else {
+      unsigned long flags;
       sh[j]->wish_block = TRUE;
       sh[j]->unchecked_isa_dma = TRUE;
+      
+      flags=claim_dma_lock();
       disable_dma(dma_channel);
       clear_dma_ff(dma_channel);
       set_dma_mode(dma_channel, DMA_MODE_CASCADE);
       enable_dma(dma_channel);
+      release_dma_lock(flags);
+      
       sh[j]->dma_channel = dma_channel;
       sprintf(BN(j), "U14F%d", j);
       bus_type = "ISA";

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov