aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/icside.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:22 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:22 -0400
commit88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch)
tree6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/icside.c
parent11998b316173f814698f9037ce9179d634d1f423 (diff)
ide: set/clear drive->waiting_for_dma flag in the core code
Set/clear drive->waiting_for_dma flag in the core code instead of in ->dma_setup and ->dma_end methods. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r--drivers/ide/icside.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 9bf57d7c8e57..4e16ce68b063 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -287,8 +287,6 @@ static int icside_dma_end(ide_drive_t *drive)
287 ide_hwif_t *hwif = drive->hwif; 287 ide_hwif_t *hwif = drive->hwif;
288 struct expansion_card *ec = ECARD_DEV(hwif->dev); 288 struct expansion_card *ec = ECARD_DEV(hwif->dev);
289 289
290 drive->waiting_for_dma = 0;
291
292 disable_dma(ec->dma); 290 disable_dma(ec->dma);
293 291
294 return get_dma_residue(ec->dma) != 0; 292 return get_dma_residue(ec->dma) != 0;
@@ -343,8 +341,6 @@ static int icside_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
343 set_dma_sg(ec->dma, hwif->sg_table, cmd->sg_nents); 341 set_dma_sg(ec->dma, hwif->sg_table, cmd->sg_nents);
344 set_dma_mode(ec->dma, dma_mode); 342 set_dma_mode(ec->dma, dma_mode);
345 343
346 drive->waiting_for_dma = 1;
347
348 return 0; 344 return 0;
349} 345}
350 346