]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
ide-floppy: report DMA handling in idefloppy_pc_intr() properly
authorBorislav Petkov <bbpetkov@yahoo.de>
Sat, 2 Feb 2008 18:56:35 +0000 (19:56 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 2 Feb 2008 18:56:35 +0000 (19:56 +0100)
Bart:
- use 'hwif' instead of 'HWIF(drive)'
- minor CodingStyle fixup

Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-floppy.c

index af4b633fa3d1c53fb820d669a87da27e002abbca..5c32d0cda4acae08db43a4b7526adf1a131a443e 100644 (file)
@@ -532,13 +532,17 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
        idefloppy_pc_t *pc = floppy->pc;
        struct request *rq = pc->rq;
        unsigned int temp;
+       int dma_error = 0;
        u16 bcount;
        u8 stat, ireason;
 
        debug_log("Reached %s interrupt handler\n", __func__);
 
        if (test_bit(PC_DMA_IN_PROGRESS, &pc->flags)) {
-               if (HWIF(drive)->ide_dma_end(drive)) {
+               dma_error = hwif->ide_dma_end(drive);
+               if (dma_error) {
+                       printk(KERN_ERR "%s: DMA %s error\n", drive->name,
+                                       rq_data_dir(rq) ? "write" : "read");
                        set_bit(PC_DMA_ERROR, &pc->flags);
                } else {
                        pc->actually_transferred = pc->request_transfer;